diff --git a/acct-group/nsd/metadata.xml b/acct-group/nsd/metadata.xml
index 7d193f3135266..115e9d64a6695 100644
--- a/acct-group/nsd/metadata.xml
+++ b/acct-group/nsd/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>kumba@gentoo.org</email>
-			<name>Joshua Kinard</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/acct-user/nsd/metadata.xml b/acct-user/nsd/metadata.xml
index 7d193f3135266..115e9d64a6695 100644
--- a/acct-user/nsd/metadata.xml
+++ b/acct-user/nsd/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>kumba@gentoo.org</email>
-			<name>Joshua Kinard</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-arch/lrzip-next/metadata.xml b/app-arch/lrzip-next/metadata.xml
index 2abeb3d4dcf5d..ae609b04e0126 100644
--- a/app-arch/lrzip-next/metadata.xml
+++ b/app-arch/lrzip-next/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>kumba@gentoo.org</email>
-			<name>Joshua Kinard</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 	A fork of Con Kolivas' 'lrzip' program that is actively maintained.  Lrzip
 	is a compression program optimised for large files. The larger the file and
diff --git a/app-arch/lrzip/metadata.xml b/app-arch/lrzip/metadata.xml
index 85eef5cdea590..ee845d57672c7 100644
--- a/app-arch/lrzip/metadata.xml
+++ b/app-arch/lrzip/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>kumba@gentoo.org</email>
-			<name>Joshua Kinard</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 	This is a compression program optimised for large files. The larger the
 	file and the more memory you have, the better the compression advantage
diff --git a/dev-libs/jemalloc/metadata.xml b/dev-libs/jemalloc/metadata.xml
index 022926696913d..641f683133071 100644
--- a/dev-libs/jemalloc/metadata.xml
+++ b/dev-libs/jemalloc/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>kumba@gentoo.org</email>
-			<name>Joshua Kinard</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="lazy-lock">Enable lazy locking (only lock when multi-threaded)</flag>
 		<flag name="prof">Enable allocation profiling</flag>
diff --git a/net-dns/nsd/metadata.xml b/net-dns/nsd/metadata.xml
index 65dad76e8f3cb..6ec888588a4a6 100644
--- a/net-dns/nsd/metadata.xml
+++ b/net-dns/nsd/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>kumba@gentoo.org</email>
-		<name>Joshua Kinard</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">NLnetLabs/nsd</remote-id>
 	</upstream>
diff --git a/sys-boot/lilo/metadata.xml b/sys-boot/lilo/metadata.xml
index fa7bf0f871125..0a0ff316148b4 100644
--- a/sys-boot/lilo/metadata.xml
+++ b/sys-boot/lilo/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>kumba@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 
 	<use>
 		<flag name="device-mapper">Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg></flag>
diff --git a/sys-fs/zerofree/metadata.xml b/sys-fs/zerofree/metadata.xml
index 66c52345ee030..d4a08711b79cc 100644
--- a/sys-fs/zerofree/metadata.xml
+++ b/sys-fs/zerofree/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>kumba@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 
 	<longdescription>
 		zerofree is a small utility designed to zero-out the free space on a filesystem.  It is especially useful for guests on a virtual machine before compacting their disk images.