diff --git a/app-crypt/efitools/metadata.xml b/app-crypt/efitools/metadata.xml
index ba25ee6d9d769..115e9d64a6695 100644
--- a/app-crypt/efitools/metadata.xml
+++ b/app-crypt/efitools/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>tamiko@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-crypt/jitterentropy-rngd/metadata.xml b/app-crypt/jitterentropy-rngd/metadata.xml
index ed5eff0c8ca95..99b1322aadcfb 100644
--- a/app-crypt/jitterentropy-rngd/metadata.xml
+++ b/app-crypt/jitterentropy-rngd/metadata.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>tamiko@gentoo.org</email>
-	<name>Matthias Maier</name>
-</maintainer>
-<longdescription>
-	The Jitter RNG daemon provides an entropy source that feeds into the
-	Linux /dev/random device if its entropy runs low. It updates the
-	/dev/random entropy estimator such that the newly provided entropy
-	unblocks /dev/random.
-</longdescription>
-<upstream>
-	<remote-id type="github">smuellerDD/jitterentropy-rngd</remote-id>
-</upstream>
+	<!-- maintainer-needed -->
+	<longdescription>
+		The Jitter RNG daemon provides an entropy source that feeds into the
+		Linux /dev/random device if its entropy runs low. It updates the
+		/dev/random entropy estimator such that the newly provided entropy
+		unblocks /dev/random.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">smuellerDD/jitterentropy-rngd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/sbsigntools/metadata.xml b/app-crypt/sbsigntools/metadata.xml
index cf02410c2f9a4..0a7cc3ea1559f 100644
--- a/app-crypt/sbsigntools/metadata.xml
+++ b/app-crypt/sbsigntools/metadata.xml
@@ -5,9 +5,6 @@
 		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">ubuntu</remote-id>
 	</upstream>
diff --git a/app-misc/hello/metadata.xml b/app-misc/hello/metadata.xml
index e5d57608d806c..4b556c94c6a0f 100644
--- a/app-misc/hello/metadata.xml
+++ b/app-misc/hello/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>tamiko@gentoo.org</email>
-    <name>Matthias Maier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="savannah">hello</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="savannah">hello</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/barcode/metadata.xml b/app-text/barcode/metadata.xml
index b4e14c04b700d..d2ff668c8768f 100644
--- a/app-text/barcode/metadata.xml
+++ b/app-text/barcode/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>tamiko@gentoo.org</email>
-    <name>Matthias Maier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="savannah">barcode</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="savannah">barcode</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-vim/vim-multiple-cursors/metadata.xml b/app-vim/vim-multiple-cursors/metadata.xml
index e53c968f7f77a..816cf28c38e36 100644
--- a/app-vim/vim-multiple-cursors/metadata.xml
+++ b/app-vim/vim-multiple-cursors/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>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
diff --git a/dev-util/astyle/metadata.xml b/dev-util/astyle/metadata.xml
index a7dfd57fd7d73..7255e89760fe0 100644
--- a/dev-util/astyle/metadata.xml
+++ b/dev-util/astyle/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>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		astyle is a code formatter for C, C++, and Java source code, with many
 		granular formatting options to assist in enforcing code formatting
diff --git a/dev-util/cppcheck/metadata.xml b/dev-util/cppcheck/metadata.xml
index 4e56958744c05..4f3e5ddc6036b 100644
--- a/dev-util/cppcheck/metadata.xml
+++ b/dev-util/cppcheck/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>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="charts">Enable QtCharts usage in the GUI</flag>
 		<flag name="htmlreport">install cppcheck-htmlreport</flag>
diff --git a/sys-fs/mp3fs/metadata.xml b/sys-fs/mp3fs/metadata.xml
index 7441425e8bc8e..bd0d05b76922d 100644
--- a/sys-fs/mp3fs/metadata.xml
+++ b/sys-fs/mp3fs/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>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">khenriks/mp3fs</remote-id>
 	</upstream>