diff --git a/app-emulation/dynamips/metadata.xml b/app-emulation/dynamips/metadata.xml
index 3b49ea6a8973b..a7daaaa0bc6fb 100644
--- a/app-emulation/dynamips/metadata.xml
+++ b/app-emulation/dynamips/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>bman@gentoo.org</email>
-		<name>Aaron Bauman</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
diff --git a/app-emulation/vpcs/metadata.xml b/app-emulation/vpcs/metadata.xml
index dd7e2b15596ab..8f5e451b6714a 100644
--- a/app-emulation/vpcs/metadata.xml
+++ b/app-emulation/vpcs/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>bman@gentoo.org</email>
-		<name>Aaron Bauman</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">vpcs</remote-id>
 	</upstream>
diff --git a/dev-python/aiohttp-cors/metadata.xml b/dev-python/aiohttp-cors/metadata.xml
index c89d18d815c9d..90e51cd487812 100644
--- a/dev-python/aiohttp-cors/metadata.xml
+++ b/dev-python/aiohttp-cors/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>bman@gentoo.org</email>
-		<name>Aaron Bauman</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">aio-libs/aiohttp-cors</remote-id>
 	</upstream>
diff --git a/dev-python/aiohttp/metadata.xml b/dev-python/aiohttp/metadata.xml
index bccf0d5b78b3d..d86e5838f4d4f 100644
--- a/dev-python/aiohttp/metadata.xml
+++ b/dev-python/aiohttp/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>bman@gentoo.org</email>
-    <name>Aaron Bauman</name>
-  </maintainer>
   <maintainer type="person">
     <email>alunduil@gentoo.org</email>
     <name>Alex Brandt</name>
diff --git a/dev-python/kiwisolver/metadata.xml b/dev-python/kiwisolver/metadata.xml
index 02f7e7f152880..6ee72f2353028 100644
--- a/dev-python/kiwisolver/metadata.xml
+++ b/dev-python/kiwisolver/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>bman@gentoo.org</email>
-    <name>Aaron Bauman</name>
-  </maintainer>
+<!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">kiwisolver</remote-id>
     <remote-id type="github">nucleic/kiwi</remote-id>
diff --git a/dev-python/python-zipstream/metadata.xml b/dev-python/python-zipstream/metadata.xml
index e9586b0f33468..34e9b246a7aab 100644
--- a/dev-python/python-zipstream/metadata.xml
+++ b/dev-python/python-zipstream/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>bman@gentoo.org</email>
-		<name>Aaron Bauman</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">allanlei/python-zipstream</remote-id>
 		<bugs-to>https://github.com/allanlei/python-zipstream/issues</bugs-to>
diff --git a/dev-python/raven/metadata.xml b/dev-python/raven/metadata.xml
index 94f5623fbaabf..4da41c0469893 100644
--- a/dev-python/raven/metadata.xml
+++ b/dev-python/raven/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>bman@gentoo.org</email>
-    <name>Aaron Bauman</name>
-  </maintainer>
+<!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">raven</remote-id>
     <remote-id type="github">getsentry/raven-python</remote-id>
diff --git a/net-firewall/fwbuilder/metadata.xml b/net-firewall/fwbuilder/metadata.xml
index 58fba7431a461..f2ba743ba4ecb 100644
--- a/net-firewall/fwbuilder/metadata.xml
+++ b/net-firewall/fwbuilder/metadata.xml
@@ -5,10 +5,6 @@
 			<email>kevin.bauman80@gmail.com</email>
 			<name>Kevin Bauman</name>
 		</maintainer>
-		<maintainer type="person">
-			<email>bman@gentoo.org</email>
-			<name>Aaron Bauman</name>
-		</maintainer>
 		<maintainer type="project">
 			<email>proxy-maint@gentoo.org</email>
 			<name>Gentoo Proxy Maintainers Project</name>
diff --git a/net-misc/gns3-converter/metadata.xml b/net-misc/gns3-converter/metadata.xml
index 477445318b252..1bdf2ea1bb477 100644
--- a/net-misc/gns3-converter/metadata.xml
+++ b/net-misc/gns3-converter/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>bman@gentoo.org</email>
-    <name>Aaron Bauman</name>
-  </maintainer>
+<!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">gns3-converter</remote-id>
     <remote-id type="github">dlintott/gns3-converter</remote-id>
diff --git a/net-misc/gns3-gui/metadata.xml b/net-misc/gns3-gui/metadata.xml
index 913fed4c205e5..e0f17e808d4f3 100644
--- a/net-misc/gns3-gui/metadata.xml
+++ b/net-misc/gns3-gui/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>bman@gentoo.org</email>
-		<name>Aaron Bauman</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">GNS3/gns3-gui</remote-id>
 	</upstream>
diff --git a/net-misc/gns3-server/metadata.xml b/net-misc/gns3-server/metadata.xml
index 6234ae3cbf049..6fc74d2d36910 100644
--- a/net-misc/gns3-server/metadata.xml
+++ b/net-misc/gns3-server/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>bman@gentoo.org</email>
-		<name>Aaron Bauman</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">GNS3/gns3-server</remote-id>
 	</upstream>
diff --git a/net-misc/leapcast/metadata.xml b/net-misc/leapcast/metadata.xml
index 770b49cab611c..dc91068f71536 100644
--- a/net-misc/leapcast/metadata.xml
+++ b/net-misc/leapcast/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>bman@gentoo.org</email>
-		<name>Aaron Bauman</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">dz0ny/leapcast</remote-id>
 	</upstream>