Set appropriate maintainer types in metadata.xml (GLEP 67)

68 files changed, 107 insertions, 107 deletions

diff --git a/net-wireless/aircrack-ng/metadata.xml b/net-wireless/aircrack-ng/metadata.xml
index 2a3030a3c21..7e8481fd0b0 100644
--- a/net-wireless/aircrack-ng/metadata.xml
+++ b/net-wireless/aircrack-ng/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 	<email>zerochaos@gentoo.org</email>
 	<name>Rick Farina</name>
 	<description>Also on the upstream team</description>
 </maintainer>
-<maintainer>
+<maintainer type="project">
 	<email>netmon@gentoo.org</email>
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
-<maintainer>
+<maintainer type="project">
 	<email>crypto@gentoo.org</email>
 	<name>Crypto</name>
 </maintainer>
diff --git a/net-wireless/airpwn/metadata.xml b/net-wireless/airpwn/metadata.xml
index a44f7d6df37..08dddce4ae7 100644
--- a/net-wireless/airpwn/metadata.xml
+++ b/net-wireless/airpwn/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>zerochaos@gentoo.org</email>
     <name>Rick Farina</name>
   </maintainer>
diff --git a/net-wireless/airtraf/metadata.xml b/net-wireless/airtraf/metadata.xml
index 3210c00f75a..0308d37d068 100644
--- a/net-wireless/airtraf/metadata.xml
+++ b/net-wireless/airtraf/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>netmon@gentoo.org</email>
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
diff --git a/net-wireless/b43-fwcutter/metadata.xml b/net-wireless/b43-fwcutter/metadata.xml
index 4ef9e6d1908..bfe34f51aa4 100644
--- a/net-wireless/b43-fwcutter/metadata.xml
+++ b/net-wireless/b43-fwcutter/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
   <email>josejx@gentoo.org</email>
   <name>Joseph Jezak</name>
 </maintainer>
-<maintainer>
+<maintainer type="person">
   <email>zerochaos@gentoo.org</email>
   <name>Rick Farina</name>
 </maintainer>
diff --git a/net-wireless/bcm43xx-fwcutter/metadata.xml b/net-wireless/bcm43xx-fwcutter/metadata.xml
index 4ef9e6d1908..bfe34f51aa4 100644
--- a/net-wireless/bcm43xx-fwcutter/metadata.xml
+++ b/net-wireless/bcm43xx-fwcutter/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
   <email>josejx@gentoo.org</email>
   <name>Joseph Jezak</name>
 </maintainer>
-<maintainer>
+<maintainer type="person">
   <email>zerochaos@gentoo.org</email>
   <name>Rick Farina</name>
 </maintainer>
diff --git a/net-wireless/bladerf-firmware/metadata.xml b/net-wireless/bladerf-firmware/metadata.xml
index 20ec6821199..23f427c6904 100644
--- a/net-wireless/bladerf-firmware/metadata.xml
+++ b/net-wireless/bladerf-firmware/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
-<maintainer>
+<maintainer type="project">
 <email>radio@gentoo.org</email>
 <name>Radio</name>
 </maintainer>
diff --git a/net-wireless/bladerf-fpga/metadata.xml b/net-wireless/bladerf-fpga/metadata.xml
index 71314342f41..8e0b69373e5 100644
--- a/net-wireless/bladerf-fpga/metadata.xml
+++ b/net-wireless/bladerf-fpga/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
-<maintainer>
+<maintainer type="project">
 <email>radio@gentoo.org</email>
 <name>Radio</name>
 </maintainer>
diff --git a/net-wireless/bladerf/metadata.xml b/net-wireless/bladerf/metadata.xml
index 22d9a1d6ecc..9106355adf4 100644
--- a/net-wireless/bladerf/metadata.xml
+++ b/net-wireless/bladerf/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
diff --git a/net-wireless/bluedevil/metadata.xml b/net-wireless/bluedevil/metadata.xml
index e218a13609c..2fdbf33d963 100644
--- a/net-wireless/bluedevil/metadata.xml
+++ b/net-wireless/bluedevil/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
diff --git a/net-wireless/blueman/metadata.xml b/net-wireless/blueman/metadata.xml
index 65cf63c6b43..9ebda01a38f 100644
--- a/net-wireless/blueman/metadata.xml
+++ b/net-wireless/blueman/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>dev-zero@gentoo.org</email>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
diff --git a/net-wireless/bluez-hcidump/metadata.xml b/net-wireless/bluez-hcidump/metadata.xml
index 8a0f59154c4..3da97a9953c 100644
--- a/net-wireless/bluez-hcidump/metadata.xml
+++ b/net-wireless/bluez-hcidump/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml
index ec7178ec7d8..b765ca45c8c 100644
--- a/net-wireless/bluez/metadata.xml
+++ b/net-wireless/bluez/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>pacho@gentoo.org</email>
     <name>Pacho Ramos</name>
   </maintainer>
diff --git a/net-wireless/broadcom-sta/metadata.xml b/net-wireless/broadcom-sta/metadata.xml
index 8358ba2fcf6..9c5a2a79338 100644
--- a/net-wireless/broadcom-sta/metadata.xml
+++ b/net-wireless/broadcom-sta/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mattst88@gentoo.org</email>
 		<name>Matt Turner</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>mpagano@gentoo.org</email>
 		<name>Mike Pagano</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>tomboy64@sina.cn</email>
 	</maintainer>
 	<upstream>
diff --git a/net-wireless/bss/metadata.xml b/net-wireless/bss/metadata.xml
index c6d862855eb..79d462e8557 100644
--- a/net-wireless/bss/metadata.xml
+++ b/net-wireless/bss/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
   <email>robbat2@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-wireless/btcrack/metadata.xml b/net-wireless/btcrack/metadata.xml
index ceccf8106cb..70c4ebfbe0e 100644
--- a/net-wireless/btcrack/metadata.xml
+++ b/net-wireless/btcrack/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
diff --git a/net-wireless/chirp/metadata.xml b/net-wireless/chirp/metadata.xml
index 3eed3509688..6158e092633 100644
--- a/net-wireless/chirp/metadata.xml
+++ b/net-wireless/chirp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 	<email>zerochaos@gentoo.org</email>
 	<name>Rick Farina</name>
 </maintainer>
-<maintainer>
+<maintainer type="project">
 	<email>radio@gentoo.org</email>
 	<name>Radio</name>
 </maintainer>
diff --git a/net-wireless/cpyrit-cuda/metadata.xml b/net-wireless/cpyrit-cuda/metadata.xml
index 52042c6ca95..8fee4bf3667 100644
--- a/net-wireless/cpyrit-cuda/metadata.xml
+++ b/net-wireless/cpyrit-cuda/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 	<email>oleg@kaa.org.ua</email>
 	<name>Oleg Kravchenko</name>
 </maintainer>
-<maintainer>
+<maintainer type="person">
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
-<maintainer>
+<maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/net-wireless/cpyrit-opencl/metadata.xml b/net-wireless/cpyrit-opencl/metadata.xml
index 52042c6ca95..8fee4bf3667 100644
--- a/net-wireless/cpyrit-opencl/metadata.xml
+++ b/net-wireless/cpyrit-opencl/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 	<email>oleg@kaa.org.ua</email>
 	<name>Oleg Kravchenko</name>
 </maintainer>
-<maintainer>
+<maintainer type="person">
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
-<maintainer>
+<maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/net-wireless/crackle/metadata.xml b/net-wireless/crackle/metadata.xml
index 4b6b68191d8..ea40f278355 100644
--- a/net-wireless/crackle/metadata.xml
+++ b/net-wireless/crackle/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
diff --git a/net-wireless/crda/metadata.xml b/net-wireless/crda/metadata.xml
index 525e2963dae..147730ec61a 100644
--- a/net-wireless/crda/metadata.xml
+++ b/net-wireless/crda/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>gurligebis@gentoo.org</email>
 		<name>Bjarke Istrup Pedersen</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
diff --git a/net-wireless/dump1090/metadata.xml b/net-wireless/dump1090/metadata.xml
index 595073647ba..04a99188b5e 100644
--- a/net-wireless/dump1090/metadata.xml
+++ b/net-wireless/dump1090/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
diff --git a/net-wireless/gnome-bluetooth/metadata.xml b/net-wireless/gnome-bluetooth/metadata.xml
index fe3dc94b2bc..39980802b1d 100644
--- a/net-wireless/gnome-bluetooth/metadata.xml
+++ b/net-wireless/gnome-bluetooth/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
diff --git a/net-wireless/gnuradio/metadata.xml b/net-wireless/gnuradio/metadata.xml
index 35d37a07255..c1685236ff6 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
diff --git a/net-wireless/gobi_loader/metadata.xml b/net-wireless/gobi_loader/metadata.xml
index b0008f01cbd..8aea492bf6b 100644
--- a/net-wireless/gobi_loader/metadata.xml
+++ b/net-wireless/gobi_loader/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
   <email>craig@gentoo.org</email>
   <name>Stefan Behte</name>
 </maintainer>
-<maintainer>
+<maintainer type="person">
   <email>polynomial-c@gentoo.org</email>
   <name>Lars Wendler</name>
   <description>Proxy maintainer for Stefan</description>
diff --git a/net-wireless/gqrx/metadata.xml b/net-wireless/gqrx/metadata.xml
index 2ac7435d145..28b2012c01c 100644
--- a/net-wireless/gqrx/metadata.xml
+++ b/net-wireless/gqrx/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
diff --git a/net-wireless/gr-baz/metadata.xml b/net-wireless/gr-baz/metadata.xml
index 522b899cb46..169a1ee4e68 100644
--- a/net-wireless/gr-baz/metadata.xml
+++ b/net-wireless/gr-baz/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 	<email>zerochaos@gentoo.org</email>
 	<name>Rick Farina</name>
 </maintainer>
-<maintainer>
+<maintainer type="project">
 	<email>radio@gentoo.org</email>
 	<name>Radio</name>
 </maintainer>
diff --git a/net-wireless/gr-iqbal/metadata.xml b/net-wireless/gr-iqbal/metadata.xml
index 20ec6821199..23f427c6904 100644
--- a/net-wireless/gr-iqbal/metadata.xml
+++ b/net-wireless/gr-iqbal/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
-<maintainer>
+<maintainer type="project">
 <email>radio@gentoo.org</email>
 <name>Radio</name>
 </maintainer>
diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
index 1b7e2744fff..e8e448711ac 100644
--- a/net-wireless/gr-osmosdr/metadata.xml
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 	<email>radio@gentoo.org</email>
 	<name>Radio</name>
 	</maintainer>
diff --git a/net-wireless/gr-paint/metadata.xml b/net-wireless/gr-paint/metadata.xml
index aaf6d57ee3b..083cee814d4 100644
--- a/net-wireless/gr-paint/metadata.xml
+++ b/net-wireless/gr-paint/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 		<description>maintainer</description>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
diff --git a/net-wireless/gr-rds/metadata.xml b/net-wireless/gr-rds/metadata.xml
index dab694d47da..9355940682b 100644
--- a/net-wireless/gr-rds/metadata.xml
+++ b/net-wireless/gr-rds/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
diff --git a/net-wireless/gr-scan/metadata.xml b/net-wireless/gr-scan/metadata.xml
index 370d4d1560c..1570f891c6a 100644
--- a/net-wireless/gr-scan/metadata.xml
+++ b/net-wireless/gr-scan/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
diff --git a/net-wireless/hackrf-tools/metadata.xml b/net-wireless/hackrf-tools/metadata.xml
index 8c617321d73..cdfd3195985 100644
--- a/net-wireless/hackrf-tools/metadata.xml
+++ b/net-wireless/hackrf-tools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
diff --git a/net-wireless/hidclient/metadata.xml b/net-wireless/hidclient/metadata.xml
index 4b6b68191d8..ea40f278355 100644
--- a/net-wireless/hidclient/metadata.xml
+++ b/net-wireless/hidclient/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
diff --git a/net-wireless/horst/metadata.xml b/net-wireless/horst/metadata.xml
index b6b141817fa..55766913567 100644
--- a/net-wireless/horst/metadata.xml
+++ b/net-wireless/horst/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml
index 7a78b14055c..0cd0092e879 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>gurligebis@gentoo.org</email>
 		<name>Bjarke Istrup Pedersen</name>
 	</maintainer>
diff --git a/net-wireless/inspectrum/metadata.xml b/net-wireless/inspectrum/metadata.xml
index 88d5e5b2a91..030d3a57a7f 100644
--- a/net-wireless/inspectrum/metadata.xml
+++ b/net-wireless/inspectrum/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 		<description>maintainer</description>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
diff --git a/net-wireless/iw/metadata.xml b/net-wireless/iw/metadata.xml
index e5ae030f575..6fd15af9368 100644
--- a/net-wireless/iw/metadata.xml
+++ b/net-wireless/iw/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>gurligebis@gentoo.org</email>
 		<name>Bjarke Istrup Pedersen</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 		<description>co-maintainer, please cc on bugs</description>
diff --git a/net-wireless/kismet-ubertooth/metadata.xml b/net-wireless/kismet-ubertooth/metadata.xml
index 30297362920..cd044c5b4a2 100644
--- a/net-wireless/kismet-ubertooth/metadata.xml
+++ b/net-wireless/kismet-ubertooth/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
diff --git a/net-wireless/kismet/metadata.xml b/net-wireless/kismet/metadata.xml
index 47f11248f28..272b818abd9 100644
--- a/net-wireless/kismet/metadata.xml
+++ b/net-wireless/kismet/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 		<description>maintainer</description>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>steev@gentoo.org</email>
 		<name>Steev Klimaszewski</name>
 		<description>co-maintainer, CC him on bugs</description>
diff --git a/net-wireless/lorcon-old/metadata.xml b/net-wireless/lorcon-old/metadata.xml
index 4b6b68191d8..ea40f278355 100644
--- a/net-wireless/lorcon-old/metadata.xml
+++ b/net-wireless/lorcon-old/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
diff --git a/net-wireless/lorcon/metadata.xml b/net-wireless/lorcon/metadata.xml
index 4b6b68191d8..ea40f278355 100644
--- a/net-wireless/lorcon/metadata.xml
+++ b/net-wireless/lorcon/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
diff --git a/net-wireless/madwifi-ng-tools/metadata.xml b/net-wireless/madwifi-ng-tools/metadata.xml
index 0cd29efddfd..e59bdee49a2 100644
--- a/net-wireless/madwifi-ng-tools/metadata.xml
+++ b/net-wireless/madwifi-ng-tools/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
diff --git a/net-wireless/madwifi-ng/metadata.xml b/net-wireless/madwifi-ng/metadata.xml
index 7891bc8cb09..6a8f4fca515 100644
--- a/net-wireless/madwifi-ng/metadata.xml
+++ b/net-wireless/madwifi-ng/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>steev@gentoo.org</email>
 		<name>Steev Klimaszewski</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
diff --git a/net-wireless/mdk/metadata.xml b/net-wireless/mdk/metadata.xml
index 10ea3417b29..2b9b4266ca5 100644
--- a/net-wireless/mdk/metadata.xml
+++ b/net-wireless/mdk/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
diff --git a/net-wireless/multimode/metadata.xml b/net-wireless/multimode/metadata.xml
index 3eed3509688..6158e092633 100644
--- a/net-wireless/multimode/metadata.xml
+++ b/net-wireless/multimode/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 	<email>zerochaos@gentoo.org</email>
 	<name>Rick Farina</name>
 </maintainer>
-<maintainer>
+<maintainer type="project">
 	<email>radio@gentoo.org</email>
 	<name>Radio</name>
 </maintainer>
diff --git a/net-wireless/ndiswrapper/metadata.xml b/net-wireless/ndiswrapper/metadata.xml
index ef0b1256a68..60222edadad 100644
--- a/net-wireless/ndiswrapper/metadata.xml
+++ b/net-wireless/ndiswrapper/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
diff --git a/net-wireless/neard/metadata.xml b/net-wireless/neard/metadata.xml
index 483f2a82439..c0b50852b7b 100644
--- a/net-wireless/neard/metadata.xml
+++ b/net-wireless/neard/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
  <email>vapier@gentoo.org</email>
  <description>fix what you like</description>
 </maintainer>
diff --git a/net-wireless/openbsc/metadata.xml b/net-wireless/openbsc/metadata.xml
index 2b8c707d8dd..7e81667e245 100644
--- a/net-wireless/openbsc/metadata.xml
+++ b/net-wireless/openbsc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
diff --git a/net-wireless/openggsn/metadata.xml b/net-wireless/openggsn/metadata.xml
index 370d4d1560c..1570f891c6a 100644
--- a/net-wireless/openggsn/metadata.xml
+++ b/net-wireless/openggsn/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
diff --git a/net-wireless/orinoco-fwutils/metadata.xml b/net-wireless/orinoco-fwutils/metadata.xml
index 5829a2106d3..703b7bb93a7 100644
--- a/net-wireless/orinoco-fwutils/metadata.xml
+++ b/net-wireless/orinoco-fwutils/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>steev@gentoo.org</email>
     <name>Stephen Klimaszweski</name>
   </maintainer>
diff --git a/net-wireless/osmobts/metadata.xml b/net-wireless/osmobts/metadata.xml
index 370d4d1560c..1570f891c6a 100644
--- a/net-wireless/osmobts/metadata.xml
+++ b/net-wireless/osmobts/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
diff --git a/net-wireless/osmocom-bb/metadata.xml b/net-wireless/osmocom-bb/metadata.xml
index 71c02432623..ca60be1c4b8 100644
--- a/net-wireless/osmocom-bb/metadata.xml
+++ b/net-wireless/osmocom-bb/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
diff --git a/net-wireless/pyrit/metadata.xml b/net-wireless/pyrit/metadata.xml
index 39769ba6a10..8d99662112e 100644
--- a/net-wireless/pyrit/metadata.xml
+++ b/net-wireless/pyrit/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 	<email>oleg@kaa.org.ua</email>
 	<name>Oleg Kravchenko</name>
 </maintainer>
-<maintainer>
+<maintainer type="person">
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
-<maintainer>
+<maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/net-wireless/python-wifi/metadata.xml b/net-wireless/python-wifi/metadata.xml
index ae04b5dc8bb..b447a239cea 100644
--- a/net-wireless/python-wifi/metadata.xml
+++ b/net-wireless/python-wifi/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
diff --git a/net-wireless/reaver/metadata.xml b/net-wireless/reaver/metadata.xml
index 52042c6ca95..8fee4bf3667 100644
--- a/net-wireless/reaver/metadata.xml
+++ b/net-wireless/reaver/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 	<email>oleg@kaa.org.ua</email>
 	<name>Oleg Kravchenko</name>
 </maintainer>
-<maintainer>
+<maintainer type="person">
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
-<maintainer>
+<maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/net-wireless/rfcat/metadata.xml b/net-wireless/rfcat/metadata.xml
index 8b5a020f4c4..8aab42bf251 100644
--- a/net-wireless/rfcat/metadata.xml
+++ b/net-wireless/rfcat/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 		<description>maintainer</description>
diff --git a/net-wireless/rfkill/metadata.xml b/net-wireless/rfkill/metadata.xml
index a196cc4ba03..c41c87f63b1 100644
--- a/net-wireless/rfkill/metadata.xml
+++ b/net-wireless/rfkill/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name> Rick Farina</name>
 	</maintainer>
diff --git a/net-wireless/rtl-sdr/metadata.xml b/net-wireless/rtl-sdr/metadata.xml
index 370d4d1560c..1570f891c6a 100644
--- a/net-wireless/rtl-sdr/metadata.xml
+++ b/net-wireless/rtl-sdr/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
diff --git a/net-wireless/spectools/metadata.xml b/net-wireless/spectools/metadata.xml
index 2ad84fcbdca..673af8f6117 100644
--- a/net-wireless/spectools/metadata.xml
+++ b/net-wireless/spectools/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 		<description>maintainer, has access to all hardware as needed</description>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>steev@gentoo.org</email>
 		<name>Steev Klimaszewski</name>
 		<description>co-maintainer, CC him on bugs</description>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 		<description>Maintainer, has 1st gen WiSpy hardware for testing</description>
diff --git a/net-wireless/ubertooth/metadata.xml b/net-wireless/ubertooth/metadata.xml
index afe153c6d3d..f73b58def75 100644
--- a/net-wireless/ubertooth/metadata.xml
+++ b/net-wireless/ubertooth/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
diff --git a/net-wireless/uhd/metadata.xml b/net-wireless/uhd/metadata.xml
index 7f10a5dc8f7..f91b166286c 100644
--- a/net-wireless/uhd/metadata.xml
+++ b/net-wireless/uhd/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>zx2c4@gentoo.org</email>
 		<name>Jason A. Donenfeld</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
diff --git a/net-wireless/wavemon/metadata.xml b/net-wireless/wavemon/metadata.xml
index b6b8956cde3..5b159fbcadd 100644
--- a/net-wireless/wavemon/metadata.xml
+++ b/net-wireless/wavemon/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
diff --git a/net-wireless/wepattack/metadata.xml b/net-wireless/wepattack/metadata.xml
index d89faad1986..d4ecb8c9e37 100644
--- a/net-wireless/wepattack/metadata.xml
+++ b/net-wireless/wepattack/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
diff --git a/net-wireless/wepdecrypt/metadata.xml b/net-wireless/wepdecrypt/metadata.xml
index 1303cacb80a..865fbda7f4b 100644
--- a/net-wireless/wepdecrypt/metadata.xml
+++ b/net-wireless/wepdecrypt/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>crypto@gentoo.org</email>
 		<name>Crypto</name>
 	</maintainer>
diff --git a/net-wireless/wireless-regdb/metadata.xml b/net-wireless/wireless-regdb/metadata.xml
index 59dda37f0bd..85961e02f62 100644
--- a/net-wireless/wireless-regdb/metadata.xml
+++ b/net-wireless/wireless-regdb/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
diff --git a/net-wireless/wireless-tools/metadata.xml b/net-wireless/wireless-tools/metadata.xml
index 90830d61085..994039f3221 100644
--- a/net-wireless/wireless-tools/metadata.xml
+++ b/net-wireless/wireless-tools/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml
index fd0f2c929b3..f0eca57a1d8 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>gurligebis@gentoo.org</email>
 		<name>Bjarke Istrup Pedersen</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
diff --git a/net-wireless/yatebts/metadata.xml b/net-wireless/yatebts/metadata.xml
index f01bfe4ff88..ccc13aaa52f 100644
--- a/net-wireless/yatebts/metadata.xml
+++ b/net-wireless/yatebts/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>