diff --git a/app-emacs/undo-tree/metadata.xml b/app-emacs/undo-tree/metadata.xml
index 00e0267703ed3..249124cca2e10 100644
--- a/app-emacs/undo-tree/metadata.xml
+++ b/app-emacs/undo-tree/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>tomka@gentoo.org</email>
-  <name>Thomas Kahle</name>
-</maintainer>
 <maintainer type="project">
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
diff --git a/app-misc/anki/metadata.xml b/app-misc/anki/metadata.xml
index b7e1e32bdcbcc..ee6762e9528d6 100644
--- a/app-misc/anki/metadata.xml
+++ b/app-misc/anki/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>tomka@gentoo.org</email>
-                <name>Thomas Kahle</name>
-	</maintainer>
 	<maintainer type="person">
                 <email>patrick@gentoo.org</email>
                 <name>Patrick Lauer</name>
diff --git a/app-portage/tatt/metadata.xml b/app-portage/tatt/metadata.xml
index 0fd488e0eb374..5029e3c544e68 100644
--- a/app-portage/tatt/metadata.xml
+++ b/app-portage/tatt/metadata.xml
@@ -4,10 +4,6 @@
   <maintainer type="person">
     <email>kensington@gentoo.org</email>
   </maintainer>
-  <maintainer type="person">
-    <email>tomka@gentoo.org</email>
-    <name>Thomas Kahle</name>
-  </maintainer>
   <use>
     <flag name="templates">Install template scripts to be used with tatt</flag>
   </use>
diff --git a/app-text/pdfsandwich/metadata.xml b/app-text/pdfsandwich/metadata.xml
index 8c10b27ec9730..0fb15c19e8478 100644
--- a/app-text/pdfsandwich/metadata.xml
+++ b/app-text/pdfsandwich/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>tomka@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 pdfsandwich generates "sandwich" OCR pdf files, i.e. pdf files which
 contain only images (no text) will be processed by optical character
diff --git a/dev-cpp/gtest/metadata.xml b/dev-cpp/gtest/metadata.xml
index dead4e3803601..b24115c0766d9 100644
--- a/dev-cpp/gtest/metadata.xml
+++ b/dev-cpp/gtest/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>tomka@gentoo.org</email>
-		<name>Thomas Kahle</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<doc lang="en">https://code.google.com/p/googletest/w/list</doc>
 		<remote-id type="google-code">googletest</remote-id>
diff --git a/dev-python/python-iwscan/metadata.xml b/dev-python/python-iwscan/metadata.xml
index f0a1e3a956adb..a5c911a491f51 100644
--- a/dev-python/python-iwscan/metadata.xml
+++ b/dev-python/python-iwscan/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>tomka@gentoo.org</email>
-  <name>Thomas Kahle</name>
-</maintainer>
 <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
diff --git a/dev-python/python-wpactrl/metadata.xml b/dev-python/python-wpactrl/metadata.xml
index f0a1e3a956adb..a5c911a491f51 100644
--- a/dev-python/python-wpactrl/metadata.xml
+++ b/dev-python/python-wpactrl/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>tomka@gentoo.org</email>
-  <name>Thomas Kahle</name>
-</maintainer>
 <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
diff --git a/media-sound/gmtp/metadata.xml b/media-sound/gmtp/metadata.xml
index bb2a423fadca2..ed33917d6fc7e 100644
--- a/media-sound/gmtp/metadata.xml
+++ b/media-sound/gmtp/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>tomka@gentoo.org</email>
-    <name>Thomas Kahle</name>
-  </maintainer>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
diff --git a/net-misc/wicd/metadata.xml b/net-misc/wicd/metadata.xml
index a0024e353d998..8fa97712dc59e 100644
--- a/net-misc/wicd/metadata.xml
+++ b/net-misc/wicd/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>tomka@gentoo.org</email>
-		<name>Thomas Kahle</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="ambiance">Install icons from Ubuntu's ambiance theme</flag>
 		<flag name="gtk">Installs a gtk UI. This is enabled by default because it is