8 files changed, 20 insertions, 9 deletions
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>