diff --git a/app-arch/deltarpm/metadata.xml b/app-arch/deltarpm/metadata.xml
index 8845ef2eb6c26..b1f9256af634f 100644
--- a/app-arch/deltarpm/metadata.xml
+++ b/app-arch/deltarpm/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>alonbl@gentoo.org</email>
-      <name>Alon Bar-Lev</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>A tool to create and apply deltarpms.</longdescription>
   <use>
     <flag name="system-zlib">
diff --git a/app-laptop/laptop-mode-tools/metadata.xml b/app-laptop/laptop-mode-tools/metadata.xml
index 862fca6f9c2e4..066248e5907f1 100644
--- a/app-laptop/laptop-mode-tools/metadata.xml
+++ b/app-laptop/laptop-mode-tools/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>alonbl@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="apm">Add APM (Advanced Power Management) support</flag>
 	</use>
diff --git a/net-dns/openresolv/metadata.xml b/net-dns/openresolv/metadata.xml
index 6c713591fd813..e5a933ad81f9a 100644
--- a/net-dns/openresolv/metadata.xml
+++ b/net-dns/openresolv/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>alonbl@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		A framework for managing DNS information
 	</longdescription>
diff --git a/net-firewall/firehol/metadata.xml b/net-firewall/firehol/metadata.xml
index 1e8e9bca98d8d..9b7a8d9bc0088 100644
--- a/net-firewall/firehol/metadata.xml
+++ b/net-firewall/firehol/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>alonbl@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">firehol</remote-id>
 		<remote-id type="github">firehol/firehol</remote-id>
diff --git a/net-misc/iprange/metadata.xml b/net-misc/iprange/metadata.xml
index 041c1966b76b8..7a38bb9009641 100644
--- a/net-misc/iprange/metadata.xml
+++ b/net-misc/iprange/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>alonbl@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-apps/fakechroot/metadata.xml b/sys-apps/fakechroot/metadata.xml
index e20ccf3259f4f..d715ee50dce85 100644
--- a/sys-apps/fakechroot/metadata.xml
+++ b/sys-apps/fakechroot/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>alonbl@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">dex4er/fakechroot</remote-id>
 	</upstream>
diff --git a/sys-apps/fakeroot-ng/metadata.xml b/sys-apps/fakeroot-ng/metadata.xml
index 3d0f3bbdd5b06..0cfd8edb60fc6 100644
--- a/sys-apps/fakeroot-ng/metadata.xml
+++ b/sys-apps/fakeroot-ng/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>alonbl@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">fakerootng</remote-id>
 	</upstream>
diff --git a/sys-power/hibernate-script/metadata.xml b/sys-power/hibernate-script/metadata.xml
index 041c1966b76b8..7a38bb9009641 100644
--- a/sys-power/hibernate-script/metadata.xml
+++ b/sys-power/hibernate-script/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>alonbl@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/virtual/resolvconf/metadata.xml b/virtual/resolvconf/metadata.xml
index 041c1966b76b8..7a38bb9009641 100644
--- a/virtual/resolvconf/metadata.xml
+++ b/virtual/resolvconf/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>alonbl@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>