diff --git a/app-alternatives/awk/metadata.xml b/app-alternatives/awk/metadata.xml
index 0cf5fbf0d2f28..7c4c46c75e100 100644
--- a/app-alternatives/awk/metadata.xml
+++ b/app-alternatives/awk/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>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
diff --git a/app-backup/rdumpfs/metadata.xml b/app-backup/rdumpfs/metadata.xml
index 25411800ccba1..d46859db33ee0 100644
--- a/app-backup/rdumpfs/metadata.xml
+++ b/app-backup/rdumpfs/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>junghans@gentoo.org</email>
-    <name>Christoph Junghans</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">chneukirchen/rdumpfs</remote-id>
   </upstream>
diff --git a/app-eselect/eselect-timezone/metadata.xml b/app-eselect/eselect-timezone/metadata.xml
index a2e015de1f8fe..c3bda71eefca0 100644
--- a/app-eselect/eselect-timezone/metadata.xml
+++ b/app-eselect/eselect-timezone/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-laptop/hdapsd/metadata.xml b/app-laptop/hdapsd/metadata.xml
index af8c4b30f8321..ba8dfb8f7fb2f 100644
--- a/app-laptop/hdapsd/metadata.xml
+++ b/app-laptop/hdapsd/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>junghans@gentoo.org</email>
-    <name>Christoph Junghans</name>
-  </maintainer>
   <maintainer type="person">
     <email>mjo@gentoo.org</email>
     <name>Michael Orlitzky</name>
diff --git a/app-laptop/tpacpi-bat/metadata.xml b/app-laptop/tpacpi-bat/metadata.xml
index 82c4e06c2bd52..6778091ccf547 100644
--- a/app-laptop/tpacpi-bat/metadata.xml
+++ b/app-laptop/tpacpi-bat/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>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">teleshoes/tpacpi-bat</remote-id>
 	</upstream>
diff --git a/app-shells/mpibash/metadata.xml b/app-shells/mpibash/metadata.xml
index 05c42cd541525..9c1468f61f6a3 100644
--- a/app-shells/mpibash/metadata.xml
+++ b/app-shells/mpibash/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>junghans@gentoo.org</email>
-    <name>Christoph Junghans</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
diff --git a/dev-cpp/kokkos/metadata.xml b/dev-cpp/kokkos/metadata.xml
index 3f0d6861e8540..41492a48020d5 100644
--- a/dev-cpp/kokkos/metadata.xml
+++ b/dev-cpp/kokkos/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>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
diff --git a/dev-cpp/random123/metadata.xml b/dev-cpp/random123/metadata.xml
index 125513d74f676..c0cd18916a93c 100644
--- a/dev-cpp/random123/metadata.xml
+++ b/dev-cpp/random123/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>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/dev-util/cwdiff/metadata.xml b/dev-util/cwdiff/metadata.xml
index c212872b9af46..f4c293a02a6f4 100644
--- a/dev-util/cwdiff/metadata.xml
+++ b/dev-util/cwdiff/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>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="mercurial">install hg wdiff alias for <pkg>dev-vcs/mercurial</pkg></flag>
 	</use>
diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass
index 2616b88311cfb..776ed2d9a1f05 100644
--- a/eclass/mercurial.eclass
+++ b/eclass/mercurial.eclass
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: mercurial.eclass
 # @MAINTAINER:
-# Christoph Junghans <junghans@gentoo.org>
+# No maintainer <maintainer-needed@gentoo.org.
 # @AUTHOR:
 # Next gen author: Krzysztof Pawlik <nelchael@gentoo.org>
 # Original author: Aron Griffis <agriffis@gentoo.org>
diff --git a/net-misc/grive/metadata.xml b/net-misc/grive/metadata.xml
index ec69db578ff81..cd02838d531ce 100644
--- a/net-misc/grive/metadata.xml
+++ b/net-misc/grive/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>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">Grive/grive</remote-id>
 	</upstream>
diff --git a/sci-chemistry/votca/metadata.xml b/sci-chemistry/votca/metadata.xml
index 137114c8f2591..ed62b17be5cc0 100644
--- a/sci-chemistry/votca/metadata.xml
+++ b/sci-chemistry/votca/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>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci-chemistry@gentoo.org</email>
 		<name>Gentoo Chemistry Project</name>
diff --git a/sci-libs/h5hut/metadata.xml b/sci-libs/h5hut/metadata.xml
index 125513d74f676..c0cd18916a93c 100644
--- a/sci-libs/h5hut/metadata.xml
+++ b/sci-libs/h5hut/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>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/sci-libs/h5part/metadata.xml b/sci-libs/h5part/metadata.xml
index 125513d74f676..c0cd18916a93c 100644
--- a/sci-libs/h5part/metadata.xml
+++ b/sci-libs/h5part/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>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/sci-libs/nfft/metadata.xml b/sci-libs/nfft/metadata.xml
index 4eda0251b43c0..e113b5eceba29 100644
--- a/sci-libs/nfft/metadata.xml
+++ b/sci-libs/nfft/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>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/sys-apps/nawk/metadata.xml b/sys-apps/nawk/metadata.xml
index 88ceca8bd8112..c47852def8263 100644
--- a/sys-apps/nawk/metadata.xml
+++ b/sys-apps/nawk/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
diff --git a/sys-cluster/libcircle/metadata.xml b/sys-cluster/libcircle/metadata.xml
index 31b8665388a15..9bfb7732ed856 100644
--- a/sys-cluster/libcircle/metadata.xml
+++ b/sys-cluster/libcircle/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>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>cluster@gentoo.org</email>
 		<name>Gentoo Cluster Project</name>
diff --git a/sys-cluster/libquo/metadata.xml b/sys-cluster/libquo/metadata.xml
index 97747862bd397..91bd0e1ac85b7 100644
--- a/sys-cluster/libquo/metadata.xml
+++ b/sys-cluster/libquo/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>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/sys-cluster/nullmpi/metadata.xml b/sys-cluster/nullmpi/metadata.xml
index a8c5bc27de735..d7006d2555f80 100644
--- a/sys-cluster/nullmpi/metadata.xml
+++ b/sys-cluster/nullmpi/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>junghans@gentoo.org</email>
-    <name>Christoph Junghans</name>
-  </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>
diff --git a/sys-fs/snapraid/metadata.xml b/sys-fs/snapraid/metadata.xml
index 6cb715dfdf3df..eb14d529cbe37 100644
--- a/sys-fs/snapraid/metadata.xml
+++ b/sys-fs/snapraid/metadata.xml
@@ -5,10 +5,6 @@
 		<email>slashbeast@gentoo.org</email>
 		<name>Piotr Karbowski</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">snapraid</remote-id>
 		<remote-id type="github">amadvance/snapraid</remote-id>