15 files changed, 60 insertions, 15 deletions
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">