diff --git a/dev-lang/mercury-extras/metadata.xml b/dev-lang/mercury-extras/metadata.xml
index ea24723e851ee..d6a4b0b729f8d 100644
--- a/dev-lang/mercury-extras/metadata.xml
+++ b/dev-lang/mercury-extras/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>keri@gentoo.org</email>
-  <name>Keri Harris</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
   <flag name="tommath">Enable support for tommath library</flag>
 </use>
diff --git a/dev-lang/mercury/metadata.xml b/dev-lang/mercury/metadata.xml
index 2b1197df03e1f..99628dd871a51 100644
--- a/dev-lang/mercury/metadata.xml
+++ b/dev-lang/mercury/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>keri@gentoo.org</email>
-    <name>Keri Harris</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="erlang">Support Mercury Erlang grade</flag>
     <flag name="trail">Support Mercury trail grades</flag>
diff --git a/dev-lang/mozart-stdlib/metadata.xml b/dev-lang/mozart-stdlib/metadata.xml
index 79e2ba1aced71..85e4ed814fa25 100644
--- a/dev-lang/mozart-stdlib/metadata.xml
+++ b/dev-lang/mozart-stdlib/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>keri@gentoo.org</email>
-  <name>Keri Harris</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-lang/mozart/metadata.xml b/dev-lang/mozart/metadata.xml
index 5bbf98d6810e9..16ef0f221f645 100644
--- a/dev-lang/mozart/metadata.xml
+++ b/dev-lang/mozart/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>keri@gentoo.org</email>
-		<name>Keri Harris</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">mozart/mozart2</remote-id>
 	</upstream>
diff --git a/net-misc/pedro/metadata.xml b/net-misc/pedro/metadata.xml
index 776ccf273d9de..85e4ed814fa25 100644
--- a/net-misc/pedro/metadata.xml
+++ b/net-misc/pedro/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>keri@gentoo.org</email>
-	<name>Keri Harris</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>