diff --git a/app-admin/metalog/metadata.xml b/app-admin/metalog/metadata.xml
index e6a099eb943e0..cf5328e7d009d 100644
--- a/app-admin/metalog/metadata.xml
+++ b/app-admin/metalog/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
diff --git a/app-arch/cksfv/metadata.xml b/app-arch/cksfv/metadata.xml
index c2a628921b6a4..d776c6cd250b6 100644
--- a/app-arch/cksfv/metadata.xml
+++ b/app-arch/cksfv/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>A Simple file verification tool to ensure that the files you recieve are the same as the originals.</longdescription>
 </pkgmetadata>
diff --git a/app-arch/funzix/metadata.xml b/app-arch/funzix/metadata.xml
index 6e64f69cd171e..ce25c1c68815e 100644
--- a/app-arch/funzix/metadata.xml
+++ b/app-arch/funzix/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">funzix</remote-id>
 	</upstream>
diff --git a/app-arch/lcab/metadata.xml b/app-arch/lcab/metadata.xml
index 97f89a99b884b..6f49eba8f4969 100644
--- a/app-arch/lcab/metadata.xml
+++ b/app-arch/lcab/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
- <description>do whatever</description>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-cdr/extract-xiso/metadata.xml b/app-cdr/extract-xiso/metadata.xml
index f644193e53179..43c2a8e7fd571 100644
--- a/app-cdr/extract-xiso/metadata.xml
+++ b/app-cdr/extract-xiso/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vapier@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <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/xdvdfs-tools/metadata.xml b/app-cdr/xdvdfs-tools/metadata.xml
index 34c1f7881902f..1e7d0f7b56239 100644
--- a/app-cdr/xdvdfs-tools/metadata.xml
+++ b/app-cdr/xdvdfs-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>
-  <maintainer type="person">
-    <email>vapier@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>Tools for manipulating Xbox ISO images</longdescription>
 </pkgmetadata>
diff --git a/app-crypt/crackpkcs12/metadata.xml b/app-crypt/crackpkcs12/metadata.xml
index 3c8846617c3f9..f8dfe46c28b30 100644
--- a/app-crypt/crackpkcs12/metadata.xml
+++ b/app-crypt/crackpkcs12/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">crackpkcs12</remote-id>
 	</upstream>
diff --git a/app-crypt/osslsigncode/metadata.xml b/app-crypt/osslsigncode/metadata.xml
index 060befc39aaca..75c8297907db5 100644
--- a/app-crypt/osslsigncode/metadata.xml
+++ b/app-crypt/osslsigncode/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-		<description>do whatever</description>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">osslsigncode</remote-id>
 	</upstream>
diff --git a/app-crypt/sbsigntool/metadata.xml b/app-crypt/sbsigntool/metadata.xml
index 6234418898f3c..ddbcc8f95eb46 100644
--- a/app-crypt/sbsigntool/metadata.xml
+++ b/app-crypt/sbsigntool/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-		<description>do whatever</description>
-	</maintainer>
 	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
 		<description>yell at me if it breaks</description>
diff --git a/app-doc/linkers-and-loaders/metadata.xml b/app-doc/linkers-and-loaders/metadata.xml
index 1021f53d6e8c7..6f49eba8f4969 100644
--- a/app-doc/linkers-and-loaders/metadata.xml
+++ b/app-doc/linkers-and-loaders/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-doc/linux-gazette-all/metadata.xml b/app-doc/linux-gazette-all/metadata.xml
index 1021f53d6e8c7..6f49eba8f4969 100644
--- a/app-doc/linux-gazette-all/metadata.xml
+++ b/app-doc/linux-gazette-all/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-doc/linux-gazette/metadata.xml b/app-doc/linux-gazette/metadata.xml
index 1021f53d6e8c7..6f49eba8f4969 100644
--- a/app-doc/linux-gazette/metadata.xml
+++ b/app-doc/linux-gazette/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-doc/phrack-all/metadata.xml b/app-doc/phrack-all/metadata.xml
index 13b2f5b0a5665..b544accdc525c 100644
--- a/app-doc/phrack-all/metadata.xml
+++ b/app-doc/phrack-all/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>
 "...those who know us know what we do, others do not have to...."
 
diff --git a/app-doc/phrack/metadata.xml b/app-doc/phrack/metadata.xml
index 13b2f5b0a5665..b544accdc525c 100644
--- a/app-doc/phrack/metadata.xml
+++ b/app-doc/phrack/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>
 "...those who know us know what we do, others do not have to...."
 
diff --git a/app-editors/curses-hexedit/metadata.xml b/app-editors/curses-hexedit/metadata.xml
index 1021f53d6e8c7..6f49eba8f4969 100644
--- a/app-editors/curses-hexedit/metadata.xml
+++ b/app-editors/curses-hexedit/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-editors/nano/metadata.xml b/app-editors/nano/metadata.xml
index 707af361447c0..87dc86fc5bcd1 100644
--- a/app-editors/nano/metadata.xml
+++ b/app-editors/nano/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>
 GNU nano - an enhanced clone of the Pico text editor.
 
diff --git a/app-misc/evtest/metadata.xml b/app-misc/evtest/metadata.xml
index 1021f53d6e8c7..6f49eba8f4969 100644
--- a/app-misc/evtest/metadata.xml
+++ b/app-misc/evtest/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-misc/pax-utils/metadata.xml b/app-misc/pax-utils/metadata.xml
index 73cd9cec1c9f7..0e2626a05dc6b 100644
--- a/app-misc/pax-utils/metadata.xml
+++ b/app-misc/pax-utils/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vapier@gentoo.org</email>
-    <description>Maintainer</description>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>A suite of ELF tools to aid auditing systems. Contains various ELF related utils for ELF32, ELF64 binaries useful for displaying PaX and security info on a large groups of binary files.</longdescription>
   <use>
     <flag name="python">Install a more powerful/faster version of lddtree</flag>
diff --git a/app-mobilephone/cobex/metadata.xml b/app-mobilephone/cobex/metadata.xml
index d5cef736f76be..f39727f3d8463 100644
--- a/app-mobilephone/cobex/metadata.xml
+++ b/app-mobilephone/cobex/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">cobex</remote-id>
 	</upstream>
diff --git a/app-portage/eclass-manpages/metadata.xml b/app-portage/eclass-manpages/metadata.xml
index 430fce10a0a15..adfe3aaf03f37 100644
--- a/app-portage/eclass-manpages/metadata.xml
+++ b/app-portage/eclass-manpages/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
 	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
diff --git a/app-portage/gentoolkit-dev/metadata.xml b/app-portage/gentoolkit-dev/metadata.xml
index 47e9d588b7c18..411cabb0fb091 100644
--- a/app-portage/gentoolkit-dev/metadata.xml
+++ b/app-portage/gentoolkit-dev/metadata.xml
@@ -5,10 +5,6 @@
 		<email>tools-portage@gentoo.org</email>
 		<name>Gentoo Portage tools team</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-		<description>Only ekeyword related bugs</description>
-	</maintainer>
 	<longdescription>
 		Gentoolkit-dev is a collection of developer tools for the Gentoo distribution.
 	</longdescription>
diff --git a/app-portage/portage-utils/metadata.xml b/app-portage/portage-utils/metadata.xml
index 496b9d3fd3e65..6f49eba8f4969 100644
--- a/app-portage/portage-utils/metadata.xml
+++ b/app-portage/portage-utils/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-text/nfoview/metadata.xml b/app-text/nfoview/metadata.xml
index 1021f53d6e8c7..6f49eba8f4969 100644
--- a/app-text/nfoview/metadata.xml
+++ b/app-text/nfoview/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-cpp/glog/metadata.xml b/dev-cpp/glog/metadata.xml
index 012c86e5ade59..a1375d627eeb1 100644
--- a/dev-cpp/glog/metadata.xml
+++ b/dev-cpp/glog/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>cpp@gentoo.org</email>
 		<name>Gentoo C++ Project</name>
diff --git a/dev-cpp/gmock/metadata.xml b/dev-cpp/gmock/metadata.xml
index 750cc7eff1670..09ce02b4056bf 100644
--- a/dev-cpp/gmock/metadata.xml
+++ b/dev-cpp/gmock/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">googlemock</remote-id>
 		<remote-id type="github">google/googlemock</remote-id>
diff --git a/dev-games/hdl_dump/metadata.xml b/dev-games/hdl_dump/metadata.xml
index 888e364f5064e..b5988412c8c3a 100644
--- a/dev-games/hdl_dump/metadata.xml
+++ b/dev-games/hdl_dump/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
  <email>games@gentoo.org</email>
  <name>Gentoo Games Project</name>
diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml
index 7106f60f89b56..91ba87d8d7023 100644
--- a/dev-java/protobuf-java/metadata.xml
+++ b/dev-java/protobuf-java/metadata.xml
@@ -1,17 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='person'>
-	<email>vapier@gentoo.org</email>
-</maintainer>
-<maintainer type='person'>
+<maintainer type="person">
 	<email>tomboy64@sina.cn</email>
 </maintainer>
-<maintainer type='project'>
+<maintainer type="project">
 	<email>java@gentoo.org</email>
 	<name>Gentoo Java Project</name>
 </maintainer>
-<maintainer type='project'>
+<maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Gentoo Proxy Maintainers Project</name>
 </maintainer>
@@ -22,6 +19,6 @@
 	<subslots>soname major version number of protobuf</subslots>
 </slots>
 <upstream>
-	<remote-id type='github'>google/protobuf</remote-id>
+	<remote-id type="github">google/protobuf</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/dev-lang/closure-compiler-bin/metadata.xml b/dev-lang/closure-compiler-bin/metadata.xml
index 2b30008525b9c..4b808e719a5a5 100644
--- a/dev-lang/closure-compiler-bin/metadata.xml
+++ b/dev-lang/closure-compiler-bin/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vapier@gentoo.org</email>
-    <description>make whatever changes you want except for removal -- i need a compiler that avoids installing a jdk</description>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">google/closure-compiler</remote-id>
   </upstream>
diff --git a/dev-libs/crossguid/metadata.xml b/dev-libs/crossguid/metadata.xml
index 4b7fa3d88e43e..ea03bb762f8ae 100644
--- a/dev-libs/crossguid/metadata.xml
+++ b/dev-libs/crossguid/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 	<remote-id type="github">graeme-hill/crossguid</remote-id>
 </upstream>
diff --git a/dev-libs/libFuzzer/metadata.xml b/dev-libs/libFuzzer/metadata.xml
index 83f3425f42811..348901b85e8c1 100644
--- a/dev-libs/libFuzzer/metadata.xml
+++ b/dev-libs/libFuzzer/metadata.xml
@@ -4,7 +4,4 @@
 <maintainer type="project">
 	<email>llvm@gentoo.org</email>
 </maintainer>
-<maintainer type="person">
-	<email>vapier@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/liblzw/metadata.xml b/dev-libs/liblzw/metadata.xml
index 2a1995bfa67d2..a261f6ca882f8 100644
--- a/dev-libs/liblzw/metadata.xml
+++ b/dev-libs/liblzw/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">freestdf</remote-id>
 		<remote-id type="github">vapier/liblzw</remote-id>
diff --git a/dev-libs/libsolv/metadata.xml b/dev-libs/libsolv/metadata.xml
index 843897bb0fab8..801f1aa5c297b 100644
--- a/dev-libs/libsolv/metadata.xml
+++ b/dev-libs/libsolv/metadata.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="rpm">Enable support for RPM files</flag>
 	</use>
diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml
index 77fbf8e4efff9..204584ce5e67d 100644
--- a/dev-libs/protobuf/metadata.xml
+++ b/dev-libs/protobuf/metadata.xml
@@ -1,13 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='person'>
-	<email>vapier@gentoo.org</email>
-</maintainer>
-<maintainer type='person'>
+<maintainer type="person">
 	<email>tomboy64@sina.cn</email>
 </maintainer>
-<maintainer type='project'>
+<maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
@@ -19,6 +16,6 @@
 	<flag name="python">Builds the Python implementation. This is not needed for Python support in protoc.</flag>
 </use>
 <upstream>
-	<remote-id type='github'>google/protobuf</remote-id>
+	<remote-id type="github">google/protobuf</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/dev-libs/zziplib/metadata.xml b/dev-libs/zziplib/metadata.xml
index b9912473f510f..e127af6371762 100644
--- a/dev-libs/zziplib/metadata.xml
+++ b/dev-libs/zziplib/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">zziplib</remote-id>
 	</upstream>
diff --git a/dev-python/boto/metadata.xml b/dev-python/boto/metadata.xml
index f162873b81146..e630c4673422d 100644
--- a/dev-python/boto/metadata.xml
+++ b/dev-python/boto/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vapier@gentoo.org</email>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-python/jsonrpclib/metadata.xml b/dev-python/jsonrpclib/metadata.xml
index 6d44e7a866ec4..227e6b1f2cbea 100644
--- a/dev-python/jsonrpclib/metadata.xml
+++ b/dev-python/jsonrpclib/metadata.xml
@@ -5,10 +5,6 @@
     <email>blueness@gentoo.org</email>
     <name>Anthony G. Basile</name>
   </maintainer>
-  <maintainer type="person">
-    <email>vapier@gentoo.org</email>
-	<name>Mike Frysinger</name>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-python/protobuf-python/metadata.xml b/dev-python/protobuf-python/metadata.xml
index 4c6fe778f3536..133ac2d04ea69 100644
--- a/dev-python/protobuf-python/metadata.xml
+++ b/dev-python/protobuf-python/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='person'>
-	<email>vapier@gentoo.org</email>
-</maintainer>
-<maintainer type='person'>
+<maintainer type="person">
 	<email>tomboy64@sina.cn</email>
 </maintainer>
 <maintainer type="project">
@@ -19,6 +16,6 @@
 	<subslots>soname major version number of protobuf</subslots>
 </slots>
 <upstream>
-	<remote-id type='github'>google/protobuf</remote-id>
+	<remote-id type="github">google/protobuf</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyelftools/metadata.xml b/dev-python/pyelftools/metadata.xml
index 49f3b842095a6..f36b83593040a 100644
--- a/dev-python/pyelftools/metadata.xml
+++ b/dev-python/pyelftools/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/pystdf/metadata.xml b/dev-python/pystdf/metadata.xml
index 4528f6d972af7..0377393eb53c1 100644
--- a/dev-python/pystdf/metadata.xml
+++ b/dev-python/pystdf/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">pystdf</remote-id>
 		<remote-id type="github">cmars/pystdf</remote-id>
diff --git a/dev-python/python-evdev/metadata.xml b/dev-python/python-evdev/metadata.xml
index 01a9e685e6893..1bdf43071500c 100644
--- a/dev-python/python-evdev/metadata.xml
+++ b/dev-python/python-evdev/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vapier@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">gvalkov/python-evdev</remote-id>
   </upstream>
diff --git a/dev-python/ws4py/metadata.xml b/dev-python/ws4py/metadata.xml
index 706d8e4b21e50..bfe3f09c78d30 100644
--- a/dev-python/ws4py/metadata.xml
+++ b/dev-python/ws4py/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vapier@gentoo.org</email>
-    <description>make whatever changes you want</description>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-tcltk/expect-lite/metadata.xml b/dev-tcltk/expect-lite/metadata.xml
index 821306cf86b2f..2026e6cc1d87c 100644
--- a/dev-tcltk/expect-lite/metadata.xml
+++ b/dev-tcltk/expect-lite/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>tcltk@gentoo.org</email>
 		<name>Gentoo Tcltk Project</name>
diff --git a/dev-util/shflags/metadata.xml b/dev-util/shflags/metadata.xml
index 85002b3b83fec..f6f583e29409f 100644
--- a/dev-util/shflags/metadata.xml
+++ b/dev-util/shflags/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
diff --git a/dev-util/stressapptest/metadata.xml b/dev-util/stressapptest/metadata.xml
index 5c0e460d8a463..7037e8e08a5eb 100644
--- a/dev-util/stressapptest/metadata.xml
+++ b/dev-util/stressapptest/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-		<description>do whatever</description>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">stressapptest/stressapptest</remote-id>
 	</upstream>
diff --git a/dev-vcs/cvsync/metadata.xml b/dev-vcs/cvsync/metadata.xml
index d32f150a3a92f..225b13769bab9 100644
--- a/dev-vcs/cvsync/metadata.xml
+++ b/dev-vcs/cvsync/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>vapier@gentoo.org</email>
-	<description>feel free to update</description>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 	<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for hash functions.</flag>
 	<flag name="mhash">Use <pkg>app-crypt/mhash</pkg> for hash functions.</flag>
diff --git a/dev-vcs/pwclient/metadata.xml b/dev-vcs/pwclient/metadata.xml
index 1021f53d6e8c7..6f49eba8f4969 100644
--- a/dev-vcs/pwclient/metadata.xml
+++ b/dev-vcs/pwclient/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/games-fps/unreal-tournament-goty/metadata.xml b/games-fps/unreal-tournament-goty/metadata.xml
index 110200e882f22..5f8f103990d54 100644
--- a/games-fps/unreal-tournament-goty/metadata.xml
+++ b/games-fps/unreal-tournament-goty/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vapier@gentoo.org</email>
-  </maintainer>
   <maintainer type="project">
     <email>games@gentoo.org</email>
     <name>Gentoo Games Project</name>
diff --git a/games-fps/unreal-tournament/metadata.xml b/games-fps/unreal-tournament/metadata.xml
index 3d068958a8633..d6fc95339e121 100644
--- a/games-fps/unreal-tournament/metadata.xml
+++ b/games-fps/unreal-tournament/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
  <email>games@gentoo.org</email>
  <name>Gentoo Games Project</name>
diff --git a/games-fps/unreal/metadata.xml b/games-fps/unreal/metadata.xml
index 0f6933df607a5..6a1fcf4b013c1 100644
--- a/games-fps/unreal/metadata.xml
+++ b/games-fps/unreal/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
  <email>games@gentoo.org</email>
  <name>Gentoo Games Project</name>
diff --git a/mail-mta/mini-qmail/metadata.xml b/mail-mta/mini-qmail/metadata.xml
index 281af61aee8b6..1c3bc7b3fcef3 100644
--- a/mail-mta/mini-qmail/metadata.xml
+++ b/mail-mta/mini-qmail/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>net-mail@gentoo.org</email>
 		<name>Net-Mail</name>
 	</maintainer>
diff --git a/media-fonts/nepali-fonts/metadata.xml b/media-fonts/nepali-fonts/metadata.xml
index 4db3ec105c1c5..33cf8572a02e7 100644
--- a/media-fonts/nepali-fonts/metadata.xml
+++ b/media-fonts/nepali-fonts/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
  <email>fonts@gentoo.org</email>
  <name>Fonts</name>
diff --git a/media-libs/gd/metadata.xml b/media-libs/gd/metadata.xml
index 35f504c1b9bed..32fa1e5daa8a4 100644
--- a/media-libs/gd/metadata.xml
+++ b/media-libs/gd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>graphics@gentoo.org</email>
 		<name>Gentoo Graphics Project</name>
diff --git a/net-analyzer/netcat/metadata.xml b/net-analyzer/netcat/metadata.xml
index 1b0803d3aadf0..28817802168bb 100644
--- a/net-analyzer/netcat/metadata.xml
+++ b/net-analyzer/netcat/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
diff --git a/net-libs/libhtp/metadata.xml b/net-libs/libhtp/metadata.xml
index ee432479ac412..3b1b37df5a690 100644
--- a/net-libs/libhtp/metadata.xml
+++ b/net-libs/libhtp/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>vapier@gentoo.org</email>
-	<description>feel free to update</description>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 	<remote-id type="github">OISF/libhtp</remote-id>
 </upstream>
diff --git a/net-libs/libqmi/metadata.xml b/net-libs/libqmi/metadata.xml
index bca6a9f230ee4..dacd578ab6f3b 100644
--- a/net-libs/libqmi/metadata.xml
+++ b/net-libs/libqmi/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-		<description>feel free to update</description>
-	</maintainer>
 	<maintainer type="person">
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
diff --git a/net-libs/nghttp2/metadata.xml b/net-libs/nghttp2/metadata.xml
index 39dbfe2a8944b..425825101bf54 100644
--- a/net-libs/nghttp2/metadata.xml
+++ b/net-libs/nghttp2/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="hpack-tools">Install HPACK (header compression) helper tools</flag>
 		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for memory allocation</flag>
diff --git a/net-misc/chrome-remote-desktop/metadata.xml b/net-misc/chrome-remote-desktop/metadata.xml
index 1021f53d6e8c7..6f49eba8f4969 100644
--- a/net-misc/chrome-remote-desktop/metadata.xml
+++ b/net-misc/chrome-remote-desktop/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/gsutil/metadata.xml b/net-misc/gsutil/metadata.xml
index df60255c433fe..6625c00f31933 100644
--- a/net-misc/gsutil/metadata.xml
+++ b/net-misc/gsutil/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">gsutil</remote-id>
 		<remote-id type="github">GoogleCloudPlatform/gsutil</remote-id>
diff --git a/net-misc/ps3mediaserver/metadata.xml b/net-misc/ps3mediaserver/metadata.xml
index 251933666ff1b..d6c0593b67a0c 100644
--- a/net-misc/ps3mediaserver/metadata.xml
+++ b/net-misc/ps3mediaserver/metadata.xml
@@ -5,9 +5,6 @@
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="multiuser">Allow renderer customization per-user.</flag>
 		<flag name="transcode">Install optional dependencies for transcoding support via media-video/mplayer</flag>
diff --git a/net-misc/ssvnc/metadata.xml b/net-misc/ssvnc/metadata.xml
index eb4341a7b3cc1..10e612cde180f 100644
--- a/net-misc/ssvnc/metadata.xml
+++ b/net-misc/ssvnc/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">ssvnc</remote-id>
 	</upstream>
diff --git a/net-misc/tlsdate/metadata.xml b/net-misc/tlsdate/metadata.xml
index 82f04441d92cb..a43835484625f 100644
--- a/net-misc/tlsdate/metadata.xml
+++ b/net-misc/tlsdate/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-		<description>feel free to fix things</description>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">ioerror/tlsdate</remote-id>
 	</upstream>
diff --git a/net-wireless/neard/metadata.xml b/net-wireless/neard/metadata.xml
index c0b50852b7b5a..896eadb2b4df9 100644
--- a/net-wireless/neard/metadata.xml
+++ b/net-wireless/neard/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
- <description>fix what you like</description>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
  <flag name="tools">build and install extra helper utilities</flag>
 </use>
diff --git a/sci-calculators/pcalc/metadata.xml b/sci-calculators/pcalc/metadata.xml
index 1852b90fa3d6f..0884de81eae43 100644
--- a/sci-calculators/pcalc/metadata.xml
+++ b/sci-calculators/pcalc/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/sys-apps/i2c-tools/metadata.xml b/sys-apps/i2c-tools/metadata.xml
index 65aa159cc0c92..6f49eba8f4969 100644
--- a/sys-apps/i2c-tools/metadata.xml
+++ b/sys-apps/i2c-tools/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='person'>
-	<email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-apps/iotools/metadata.xml b/sys-apps/iotools/metadata.xml
index dde53cf2f5ed8..c4098c5336c7d 100644
--- a/sys-apps/iotools/metadata.xml
+++ b/sys-apps/iotools/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
  <flag name="make-symlinks">Generate sub-command symlinks to iotools -- note that a lot are simple like "xor"</flag>
 </use>
diff --git a/sys-apps/superiotool/metadata.xml b/sys-apps/superiotool/metadata.xml
index 27a49c3348c62..3d1af92d107c0 100644
--- a/sys-apps/superiotool/metadata.xml
+++ b/sys-apps/superiotool/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="pci">Support for PCI-attached "Super I/Os" (e.g. in VIA VT82686A/B).</flag>
 	</use>
diff --git a/sys-auth/bioapi/metadata.xml b/sys-auth/bioapi/metadata.xml
index 313b88162827c..1a2c07255fd3d 100644
--- a/sys-auth/bioapi/metadata.xml
+++ b/sys-auth/bioapi/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-		<name>Mike Frysinger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">bioapi-linux</remote-id>
 		<remote-id type="github">mr-c/bioapi-linux</remote-id>
diff --git a/sys-auth/google-authenticator/metadata.xml b/sys-auth/google-authenticator/metadata.xml
index 5af27d4b6cf66..97deaea4335ed 100644
--- a/sys-auth/google-authenticator/metadata.xml
+++ b/sys-auth/google-authenticator/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 	<remote-id type="github">google/google-authenticator-libpam</remote-id>
 </upstream>
diff --git a/sys-auth/pam_bioapi/metadata.xml b/sys-auth/pam_bioapi/metadata.xml
index 91d4d8ecea2a2..93d9ad1c980c4 100644
--- a/sys-auth/pam_bioapi/metadata.xml
+++ b/sys-auth/pam_bioapi/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-		<name>Mike Frysinger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">pam-bioapi</remote-id>
 	</upstream>
diff --git a/sys-auth/tfm-fingerprint/metadata.xml b/sys-auth/tfm-fingerprint/metadata.xml
index bb4e0a5050709..6f49eba8f4969 100644
--- a/sys-auth/tfm-fingerprint/metadata.xml
+++ b/sys-auth/tfm-fingerprint/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>vapier@gentoo.org</email>
-  <name>Mike Frysinger</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-boot/cromwell-bin/metadata.xml b/sys-boot/cromwell-bin/metadata.xml
index 43ce42ffba11e..e7084b8eb947a 100644
--- a/sys-boot/cromwell-bin/metadata.xml
+++ b/sys-boot/cromwell-bin/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vapier@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <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 2a1eff7d20ef8..fdae7ef5ba0a9 100644
--- a/sys-boot/cromwell/metadata.xml
+++ b/sys-boot/cromwell/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vapier@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>Xbox boot loader</longdescription>
 </pkgmetadata>
diff --git a/sys-boot/raincoat/metadata.xml b/sys-boot/raincoat/metadata.xml
index c5203c8df796e..237bbf315957a 100644
--- a/sys-boot/raincoat/metadata.xml
+++ b/sys-boot/raincoat/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vapier@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>Flash the Xbox boot chip</longdescription>
   <upstream>
     <remote-id type="sourceforge">xbox-linux</remote-id>
diff --git a/sys-boot/vboot-utils/metadata.xml b/sys-boot/vboot-utils/metadata.xml
index 97022468c1443..7cf6be5c254f9 100644
--- a/sys-boot/vboot-utils/metadata.xml
+++ b/sys-boot/vboot-utils/metadata.xml
@@ -9,7 +9,4 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
+	</pkgmetadata>
diff --git a/sys-devel/crossdev/metadata.xml b/sys-devel/crossdev/metadata.xml
index a9e5c80cceaa8..496c0ca9a6fe4 100644
--- a/sys-devel/crossdev/metadata.xml
+++ b/sys-devel/crossdev/metadata.xml
@@ -5,9 +5,6 @@
 <email>crossdev@gentoo.org</email>
 <name>Gentoo Crossdev Team</name>
 </maintainer>
-<maintainer type="person">
-<email>vapier@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
 <email>embedded@gentoo.org</email>
 <name>Embedded Gentoo</name>
diff --git a/sys-fs/libfat/metadata.xml b/sys-fs/libfat/metadata.xml
index 8c503f1a5141d..7747615af765d 100644
--- a/sys-fs/libfat/metadata.xml
+++ b/sys-fs/libfat/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-		<description>make whatever changes you want</description>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">libfat</remote-id>
 	</upstream>
diff --git a/sys-kernel/xbox-sources/metadata.xml b/sys-kernel/xbox-sources/metadata.xml
index f1450dae9eaa9..dbad95c4a16c0 100644
--- a/sys-kernel/xbox-sources/metadata.xml
+++ b/sys-kernel/xbox-sources/metadata.xml
@@ -5,9 +5,6 @@
 		<email>kernel@gentoo.org</email>
 		<name>Gentoo Kernel Project</name>
 	</maintainer>
-	<maintainer type="person">
-		<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-libs/libnih/metadata.xml b/sys-libs/libnih/metadata.xml
index a889a8646dfc4..c029a63d0b848 100644
--- a/sys-libs/libnih/metadata.xml
+++ b/sys-libs/libnih/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-		<description>feel free to update however you like</description>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="launchpad">libnih</remote-id>
 	</upstream>
diff --git a/sys-libs/libseccomp/metadata.xml b/sys-libs/libseccomp/metadata.xml
index 3a6400d9d03e2..56f0df8af09f4 100644
--- a/sys-libs/libseccomp/metadata.xml
+++ b/sys-libs/libseccomp/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">seccomp/libseccomp</remote-id>
 		<remote-id type="sourceforge">libseccomp</remote-id>
diff --git a/sys-libs/uclibc/metadata.xml b/sys-libs/uclibc/metadata.xml
index 9de4d50e5d413..d5ebc1b71d8d7 100644
--- a/sys-libs/uclibc/metadata.xml
+++ b/sys-libs/uclibc/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
 	<maintainer type="person">
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
diff --git a/sys-process/dcron/metadata.xml b/sys-process/dcron/metadata.xml
index 30cd90ed98add..4fc1e843e09b9 100644
--- a/sys-process/dcron/metadata.xml
+++ b/sys-process/dcron/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>vapier@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
 	<email>cron-bugs@gentoo.org</email>
 </maintainer>
diff --git a/www-apache/mod_h2/metadata.xml b/www-apache/mod_h2/metadata.xml
index fc78d93eca534..4c053d99d6a4b 100644
--- a/www-apache/mod_h2/metadata.xml
+++ b/www-apache/mod_h2/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">icing/mod_h2</remote-id>
 	</upstream>
diff --git a/x11-drivers/xf86-video-sisusb/metadata.xml b/x11-drivers/xf86-video-sisusb/metadata.xml
index cf7205d4860d7..7a7bbf8105443 100644
--- a/x11-drivers/xf86-video-sisusb/metadata.xml
+++ b/x11-drivers/xf86-video-sisusb/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-		<name>Mike Frysinger</name>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>x11@gentoo.org</email>
 		<name>X11</name>
 	</maintainer>
diff --git a/x11-libs/libast/metadata.xml b/x11-libs/libast/metadata.xml
index 803f108ffe338..dd5dfdb80459c 100644
--- a/x11-libs/libast/metadata.xml
+++ b/x11-libs/libast/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>
 LibAST is the Library of Assorted Spiffy Things.  It contains many
 spiffy things, and it is a library.  Thus, the ever-so-creative name.
diff --git a/x11-terms/eterm/metadata.xml b/x11-terms/eterm/metadata.xml
index d565cffc696d5..9a366d709a348 100644
--- a/x11-terms/eterm/metadata.xml
+++ b/x11-terms/eterm/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 Eterm is a color vt102 terminal emulator intended as a replacement for 
 xterm. It is designed with a Freedom of Choice philosophy, leaving as