diff --git a/app-admin/logrotate/metadata.xml b/app-admin/logrotate/metadata.xml
index e5648d41d70a6..7ace94cc2ebee 100644
--- a/app-admin/logrotate/metadata.xml
+++ b/app-admin/logrotate/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>nimiux@gentoo.org</email>
-		<name>Chema Alonso</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Logrotate allows for the automatic rotation compression, removal
 		and mailing of log files. Logrotate can be set to handle a log
diff --git a/app-admin/mktwpol/metadata.xml b/app-admin/mktwpol/metadata.xml
index e635c47b95a43..7fc329f5c9b81 100644
--- a/app-admin/mktwpol/metadata.xml
+++ b/app-admin/mktwpol/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>nimiux@gentoo.org</email>
-		<name>Chema Alonso</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer status="active">
 			<email>c.cboldt@gmail.com</email>
diff --git a/app-admin/swatchdog/metadata.xml b/app-admin/swatchdog/metadata.xml
index e0a3fdd952e81..85011a1a233cc 100644
--- a/app-admin/swatchdog/metadata.xml
+++ b/app-admin/swatchdog/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>nimiux@gentoo.org</email>
-		<name>Chema Alonso</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		swatchdog.pl started out as swatch, the "simple watchdog"
 		for activity monitoring log files produced by UNIX's syslog
diff --git a/app-admin/tripwire/metadata.xml b/app-admin/tripwire/metadata.xml
index 9cf6122184441..af0f126ac4e75 100644
--- a/app-admin/tripwire/metadata.xml
+++ b/app-admin/tripwire/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>nimiux@gentoo.org</email>
-		<name>Chema Alonso</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Tripwire is a tool that aids system administrators and users in
 		monitoring a designated set of files for any changes. Used with system
diff --git a/app-emulation/free42/metadata.xml b/app-emulation/free42/metadata.xml
index 8cd4a7ec831c5..1c7c6e8d33baa 100644
--- a/app-emulation/free42/metadata.xml
+++ b/app-emulation/free42/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>nimiux@gentoo.org</email>
-    <name>Chema Alonso</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
      An HP-42S Calculator Simulator
   </longdescription>
diff --git a/app-emulation/libdsk/metadata.xml b/app-emulation/libdsk/metadata.xml
index cd8c274bc1eb2..7a38bb9009641 100644
--- a/app-emulation/libdsk/metadata.xml
+++ b/app-emulation/libdsk/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>nimiux@gentoo.org</email>
-		<name>Chema Alonso Josa</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-emulation/x48/metadata.xml b/app-emulation/x48/metadata.xml
index b1e78a979e468..f87e1e5b28de7 100644
--- a/app-emulation/x48/metadata.xml
+++ b/app-emulation/x48/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>nimiux@gentoo.org</email>
-    <name>Chema Alonso</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
     The x48 package is an emulator of the Saturn Processor and the I/O of an
     HP48 calculator. 
diff --git a/app-emulation/xcpc/metadata.xml b/app-emulation/xcpc/metadata.xml
index 6ac042fbccc53..55dccaa5b8f22 100644
--- a/app-emulation/xcpc/metadata.xml
+++ b/app-emulation/xcpc/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>nimiux@gentoo.org</email>
-		<name>Chema Alonso Josa</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">xcpc</remote-id>
 	</upstream>
diff --git a/app-misc/linux-logo/metadata.xml b/app-misc/linux-logo/metadata.xml
index 8848712a8765f..28aea643562fc 100644
--- a/app-misc/linux-logo/metadata.xml
+++ b/app-misc/linux-logo/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>nimiux@gentoo.org</email>
-  <name>Chema Alonso</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
   A utility that displays an ANSI/ASCII logo and some system information
 </longdescription>
diff --git a/app-misc/muttprint/metadata.xml b/app-misc/muttprint/metadata.xml
index acd6628e69778..adfa2f1f4a126 100644
--- a/app-misc/muttprint/metadata.xml
+++ b/app-misc/muttprint/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>nimiux@gentoo.org</email>
-		<name>Chema Alonso</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Pretty printing of your mails
 	</longdescription>
diff --git a/app-misc/vifm/metadata.xml b/app-misc/vifm/metadata.xml
index 564dc1b9462ea..4395156e1f28c 100644
--- a/app-misc/vifm/metadata.xml
+++ b/app-misc/vifm/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>nimiux@gentoo.org</email>
-		<name>Chema Alonso</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 	Vifm is a ncurses based file manager with vi like keybindings. If you
 	use vi, vifm gives you complete keyboard control over your files without
diff --git a/app-portage/conf-update/metadata.xml b/app-portage/conf-update/metadata.xml
index 3307947ef434e..9c97e58ec2724 100644
--- a/app-portage/conf-update/metadata.xml
+++ b/app-portage/conf-update/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>nimiux@gentoo.org</email>
-		<name>Chema Alonso</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		conf-update is a curses based tool for the Gentoo Linux portage system
 	</longdescription>
diff --git a/x11-wm/stumpwm-contrib/metadata.xml b/x11-wm/stumpwm-contrib/metadata.xml
index 910100127ec64..9ce8e89e4dd8b 100644
--- a/x11-wm/stumpwm-contrib/metadata.xml
+++ b/x11-wm/stumpwm-contrib/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>nimiux@gentoo.org</email>
-		<name>Chema Alonso Josa</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">stumpwm/stumpwm-contrib</remote-id>
 	</upstream>
diff --git a/x11-wm/stumpwm/metadata.xml b/x11-wm/stumpwm/metadata.xml
index 735e47be73d7e..0af3d431108f9 100644
--- a/x11-wm/stumpwm/metadata.xml
+++ b/x11-wm/stumpwm/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>nimiux@gentoo.org</email>
-    <name>Chema Alonso</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
     Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in
     Common Lisp.