diff --git a/app-misc/xmind/metadata.xml b/app-misc/xmind/metadata.xml
index 8c8ef6e93c288..7a38bb9009641 100644
--- a/app-misc/xmind/metadata.xml
+++ b/app-misc/xmind/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>creffett@gentoo.org</email>
-		<name>Chris Reffett</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-office/projectlibre-bin/metadata.xml b/app-office/projectlibre-bin/metadata.xml
index 5ae0c0c4e56fa..b3f70e985d151 100644
--- a/app-office/projectlibre-bin/metadata.xml
+++ b/app-office/projectlibre-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>creffett@gentoo.org</email>
-		<name>Chris Reffett</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">projectlibre</remote-id>
 	</upstream>
diff --git a/dev-libs/libzip/metadata.xml b/dev-libs/libzip/metadata.xml
index 7f6898ece72e2..b27a9ea54b328 100644
--- a/dev-libs/libzip/metadata.xml
+++ b/dev-libs/libzip/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>creffett@gentoo.org</email>
-	<name>Chris Reffett</name>
-</maintainer>
 <maintainer type="project">
 	<email>kde@gentoo.org</email>
 	<name>Gentoo KDE Project</name>
diff --git a/dev-util/cmocka/metadata.xml b/dev-util/cmocka/metadata.xml
index b659c1627a386..b1435fc3cec15 100644
--- a/dev-util/cmocka/metadata.xml
+++ b/dev-util/cmocka/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>creffett@gentoo.org</email>
-        <name>Chris Reffett</name>
-</maintainer>
 <maintainer type="project">
         <email>kde@gentoo.org</email>
         <name>Gentoo KDE Project</name>
diff --git a/games-roguelike/dwarf-fortress/metadata.xml b/games-roguelike/dwarf-fortress/metadata.xml
index 3d014ad3a9b6e..6f49eba8f4969 100644
--- a/games-roguelike/dwarf-fortress/metadata.xml
+++ b/games-roguelike/dwarf-fortress/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>creffett@gentoo.org</email>
-	<name>Chris Reffett</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-analyzer/nagios-check_dnssec/metadata.xml b/net-analyzer/nagios-check_dnssec/metadata.xml
index b7624565acac7..a15e870b6e078 100644
--- a/net-analyzer/nagios-check_dnssec/metadata.xml
+++ b/net-analyzer/nagios-check_dnssec/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>creffett@gentoo.org</email>
-      <name>Chris Reffett</name>
-  </maintainer>
   <maintainer type="project">
       <email>sysadmin@gentoo.org</email>
       <name>Gentoo Sysadmin Project</name>
diff --git a/net-analyzer/nagios-check_glsa2/metadata.xml b/net-analyzer/nagios-check_glsa2/metadata.xml
index 37450fe98c623..d01f11d38ed2b 100644
--- a/net-analyzer/nagios-check_glsa2/metadata.xml
+++ b/net-analyzer/nagios-check_glsa2/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>creffett@gentoo.org</email>
-    <name>Chris Reffett</name>
-  </maintainer>
   <maintainer type="project">
     <email>sysadmin@gentoo.org</email>
     <name>Gentoo Sysadmin Project</name>
diff --git a/net-analyzer/nagios-check_logfiles/metadata.xml b/net-analyzer/nagios-check_logfiles/metadata.xml
index 690dfd5d057d3..599b5a1c1aece 100644
--- a/net-analyzer/nagios-check_logfiles/metadata.xml
+++ b/net-analyzer/nagios-check_logfiles/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>creffett@gentoo.org</email>
-		<name>Chris Reffett</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sysadmin@gentoo.org</email>
 		<name>Gentoo Sysadmin Project</name>
diff --git a/net-analyzer/nagios-plugins-snmp/metadata.xml b/net-analyzer/nagios-plugins-snmp/metadata.xml
index b7624565acac7..a15e870b6e078 100644
--- a/net-analyzer/nagios-plugins-snmp/metadata.xml
+++ b/net-analyzer/nagios-plugins-snmp/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>creffett@gentoo.org</email>
-      <name>Chris Reffett</name>
-  </maintainer>
   <maintainer type="project">
       <email>sysadmin@gentoo.org</email>
       <name>Gentoo Sysadmin Project</name>
diff --git a/sci-misc/netlogo-bin/metadata.xml b/sci-misc/netlogo-bin/metadata.xml
index f483188130186..b58980b02e5b4 100644
--- a/sci-misc/netlogo-bin/metadata.xml
+++ b/sci-misc/netlogo-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>creffett@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 NetLogo is a programmable modeling environment for simulating natural and 
 social phenomena. It is particularly well suited for modeling complex 
diff --git a/sys-apps/lnxhc/metadata.xml b/sys-apps/lnxhc/metadata.xml
index 36bfe2a121c58..8ee14e7cb1711 100644
--- a/sys-apps/lnxhc/metadata.xml
+++ b/sys-apps/lnxhc/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>creffett@gentoo.org</email>
-		<name>Chris Reffett</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">lnxhc</remote-id>
 	</upstream>