diff --git a/acct-group/davfs2/metadata.xml b/acct-group/davfs2/metadata.xml
index afc38f2da922..115e9d64a669 100644
--- a/acct-group/davfs2/metadata.xml
+++ b/acct-group/davfs2/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gokturk@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/acct-user/davfs2/metadata.xml b/acct-user/davfs2/metadata.xml
index afc38f2da922..115e9d64a669 100644
--- a/acct-user/davfs2/metadata.xml
+++ b/acct-user/davfs2/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gokturk@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-benchmarks/bonnie++/metadata.xml b/app-benchmarks/bonnie++/metadata.xml
index 0ded66f32d8b..75f8b96eb6d8 100644
--- a/app-benchmarks/bonnie++/metadata.xml
+++ b/app-benchmarks/bonnie++/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gokturk@gentoo.org</email>
-		<name>Göktürk Yüksek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Bonnie++ is based on the Bonnie hard drive benchmark by Tim Bray. This
 		program is used by ReiserFS developers, but can be useful for anyone
diff --git a/app-benchmarks/filebench/metadata.xml b/app-benchmarks/filebench/metadata.xml
index 9e4b6c41029d..27e50dded71e 100644
--- a/app-benchmarks/filebench/metadata.xml
+++ b/app-benchmarks/filebench/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gokturk@gentoo.org</email>
-		<name>Göktürk Yüksek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="auto-completion">Enable command-line autocompletion using <pkg>dev-libs/libtecla</pkg></flag>
 	</use>
diff --git a/app-benchmarks/httperf/metadata.xml b/app-benchmarks/httperf/metadata.xml
index 756a28c56e2f..faf958fe10fe 100644
--- a/app-benchmarks/httperf/metadata.xml
+++ b/app-benchmarks/httperf/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gokturk@gentoo.org</email>
-		<name>Göktürk Yüksek</name>
-	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>zekeby@fastmail.com</email>
-		<name>Taha Göktuğ Yüksek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">Httperf is a tool for measuring web server
 		performance. It provides a flexible facility for generating various HTTP
 		workloads and for measuring server performance. The focus of httperf is
diff --git a/app-crypt/jitterentropy/metadata.xml b/app-crypt/jitterentropy/metadata.xml
index 9025bc9ab092..c394a72d4dce 100644
--- a/app-crypt/jitterentropy/metadata.xml
+++ b/app-crypt/jitterentropy/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gokturk@gentoo.org</email>
-		<name>Göktürk Yüksek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		The Jitter RNG provides a noise source using the CPU execution
 		timing jitter. It does not depend on any system resource other
diff --git a/app-crypt/veracrypt/metadata.xml b/app-crypt/veracrypt/metadata.xml
index baec785c468c..08d1e5fa44f9 100644
--- a/app-crypt/veracrypt/metadata.xml
+++ b/app-crypt/veracrypt/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gokturk@gentoo.org</email>
-		<name>Göktürk Yüksek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">veracrypt/VeraCrypt</remote-id>
 	</upstream>
diff --git a/app-forensics/sleuthkit/metadata.xml b/app-forensics/sleuthkit/metadata.xml
index 577cfefc8b1b..9a98e46511df 100644
--- a/app-forensics/sleuthkit/metadata.xml
+++ b/app-forensics/sleuthkit/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>gokturk@gentoo.org</email>
-    <name>Göktürk Yüksek</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="aff">Enable extra aff formats</flag>
     <flag name="ewf">Enable libewf support</flag>
diff --git a/app-laptop/mbpfan/metadata.xml b/app-laptop/mbpfan/metadata.xml
index bc3a41c8f1d6..6e91c963da58 100644
--- a/app-laptop/mbpfan/metadata.xml
+++ b/app-laptop/mbpfan/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>gokturk@gentoo.org</email>
-    <name>Göktürk Yüksek</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
     mbpfan is a daemon that uses input from coretemp module and sets
     the fan speed using the applesmc module. This is an enhanced
diff --git a/dev-vcs/gitstats/metadata.xml b/dev-vcs/gitstats/metadata.xml
index 6765528f28fe..638175e32cd3 100644
--- a/dev-vcs/gitstats/metadata.xml
+++ b/dev-vcs/gitstats/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gokturk@gentoo.org</email>
-		<name>Göktürk Yüksek</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>amadio@gentoo.org</email>
 		<name>Guilherme Amadio</name>
diff --git a/media-sound/playerctl/metadata.xml b/media-sound/playerctl/metadata.xml
index 0a8532094796..7c6580c79ebe 100644
--- a/media-sound/playerctl/metadata.xml
+++ b/media-sound/playerctl/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>gokturk@gentoo.org</email>
-    <name>Göktürk Yüksek</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">acrisci/playerctl</remote-id>
   </upstream>
diff --git a/net-fs/davfs2/metadata.xml b/net-fs/davfs2/metadata.xml
index 6fdc1414aeb9..1fd3e7bfaa04 100644
--- a/net-fs/davfs2/metadata.xml
+++ b/net-fs/davfs2/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>gokturk@gentoo.org</email>
-    <name>Göktürk Yüksek</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="savannah-nongnu">davfs2</remote-id>
   </upstream>
diff --git a/sys-apps/rng-tools/metadata.xml b/sys-apps/rng-tools/metadata.xml
index 75129d702ff5..5eb1116215c3 100644
--- a/sys-apps/rng-tools/metadata.xml
+++ b/sys-apps/rng-tools/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>gokturk@gentoo.org</email>
-	<name>Göktürk Yüksek</name>
-</maintainer>
 <maintainer type="project">
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
diff --git a/sys-auth/pam_u2f/metadata.xml b/sys-auth/pam_u2f/metadata.xml
index 36d8f4d6d2d7..9ad3cb7213e4 100644
--- a/sys-auth/pam_u2f/metadata.xml
+++ b/sys-auth/pam_u2f/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>gokturk@gentoo.org</email>
-    <name>Göktürk Yüksek</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="debug">
       Enable debug messages using the pam logging macros.
diff --git a/sys-fs/ext4magic/metadata.xml b/sys-fs/ext4magic/metadata.xml
index 4c8ae9a5462b..b02a566e6e59 100644
--- a/sys-fs/ext4magic/metadata.xml
+++ b/sys-fs/ext4magic/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gokturk@gentoo.org</email>
-		<name>Göktürk Yüksek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="expert-mode">Builds ext4magic with expert mode. Highly useful in recovering data from a corrupted filesystem</flag>
 		<flag name="file-attr">Enable the recovery of file attributes (append, immutable, nodump etc)</flag>
diff --git a/sys-fs/fscrypt/metadata.xml b/sys-fs/fscrypt/metadata.xml
index be811aa924e4..da484631bc4c 100644
--- a/sys-fs/fscrypt/metadata.xml
+++ b/sys-fs/fscrypt/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type='person'>
+	<maintainer type="person">
 		<email>flow@gentoo.org</email>
 		<name>Florian Schmaus</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>gokturk@gentoo.org</email>
-		<name>Göktürk Yüksek</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">google/fscrypt</remote-id>
 	</upstream>