diff --git a/dev-python/compizconfig-python/metadata.xml b/dev-python/compizconfig-python/metadata.xml
index 240169e021df0..e24b832e35506 100644
--- a/dev-python/compizconfig-python/metadata.xml
+++ b/dev-python/compizconfig-python/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>desktop-effects@gentoo.org</email>
-	<name>Desktop effects</name>
-</maintainer>
-<longdescription lang="en">Python bindings for libcompizconfig.</longdescription>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">Python bindings for libcompizconfig.</longdescription>
 </pkgmetadata>
diff --git a/x11-apps/fusion-icon/metadata.xml b/x11-apps/fusion-icon/metadata.xml
index f93d4ed78c7fe..4c1ae1d4ad6f0 100644
--- a/x11-apps/fusion-icon/metadata.xml
+++ b/x11-apps/fusion-icon/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-effects@gentoo.org</email>
-		<name>Desktop effects</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">Compiz Fusion Tray Icon and Manager.</longdescription>
 </pkgmetadata>
diff --git a/x11-libs/compizconfig-backend-gconf/metadata.xml b/x11-libs/compizconfig-backend-gconf/metadata.xml
index 4d97612468ed4..2a469e3b0c684 100644
--- a/x11-libs/compizconfig-backend-gconf/metadata.xml
+++ b/x11-libs/compizconfig-backend-gconf/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>desktop-effects@gentoo.org</email>
-	<name>Desktop effects</name>
-</maintainer>
-<longdescription lang="en">The gconf backend for CompizConfig.</longdescription>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">The gconf backend for CompizConfig.</longdescription>
 </pkgmetadata>
diff --git a/x11-libs/compizconfig-backend-kconfig4/metadata.xml b/x11-libs/compizconfig-backend-kconfig4/metadata.xml
index 5a550e63b11d0..d191429cf7b6c 100644
--- a/x11-libs/compizconfig-backend-kconfig4/metadata.xml
+++ b/x11-libs/compizconfig-backend-kconfig4/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>desktop-effects@gentoo.org</email>
-	<name>Desktop effects</name>
-</maintainer>
-<longdescription lang="en">The kconfig backend for CompizConfig.</longdescription>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">The kconfig backend for CompizConfig.</longdescription>
 </pkgmetadata>
diff --git a/x11-libs/libcompizconfig/metadata.xml b/x11-libs/libcompizconfig/metadata.xml
index 6e3bb383dd37e..30804a8627765 100644
--- a/x11-libs/libcompizconfig/metadata.xml
+++ b/x11-libs/libcompizconfig/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>desktop-effects@gentoo.org</email>
-	<name>Desktop effects</name>
-</maintainer>
-<longdescription lang="en">Libcompizconfig is an alternative configuration system for compiz.</longdescription>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">Libcompizconfig is an alternative configuration system for compiz.</longdescription>
 </pkgmetadata>
diff --git a/x11-misc/3dfb/metadata.xml b/x11-misc/3dfb/metadata.xml
index a36427e7679d0..a8831e3ae31ef 100644
--- a/x11-misc/3dfb/metadata.xml
+++ b/x11-misc/3dfb/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-effects@gentoo.org</email>
-		<name>Desktop effects</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">dz3d</remote-id>
 	</upstream>
diff --git a/x11-misc/3dfm/metadata.xml b/x11-misc/3dfm/metadata.xml
index a5a3d05454a74..5a936625c7667 100644
--- a/x11-misc/3dfm/metadata.xml
+++ b/x11-misc/3dfm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-effects@gentoo.org</email>
-		<name>Desktop effects</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">innolab</remote-id>
 	</upstream>
diff --git a/x11-misc/ccsm/metadata.xml b/x11-misc/ccsm/metadata.xml
index 5c8cd1ca91ec6..3f57497447fba 100644
--- a/x11-misc/ccsm/metadata.xml
+++ b/x11-misc/ccsm/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>desktop-effects@gentoo.org</email>
-	<name>Desktop effects</name>
-</maintainer>
-<longdescription lang="en">Compizconfig Settings Manager.</longdescription>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">Compizconfig Settings Manager.</longdescription>
 </pkgmetadata>
diff --git a/x11-misc/simple-ccsm/metadata.xml b/x11-misc/simple-ccsm/metadata.xml
index 43da4805e440a..173985d43602d 100644
--- a/x11-misc/simple-ccsm/metadata.xml
+++ b/x11-misc/simple-ccsm/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>desktop-effects@gentoo.org</email>
-	<name>Desktop effects</name>
-</maintainer>
-<longdescription lang="en">Simplified Compizconfig Settings Manager.</longdescription>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">Simplified Compizconfig Settings Manager.</longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/compiz-plugins-extra/metadata.xml b/x11-plugins/compiz-plugins-extra/metadata.xml
index 8fd6a6b657be9..34693565222f2 100644
--- a/x11-plugins/compiz-plugins-extra/metadata.xml
+++ b/x11-plugins/compiz-plugins-extra/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-    <email>desktop-effects@gentoo.org</email>
-    <name>Desktop effects</name>
-  </maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 &gt;Package with several compiz-fusion plugins:
 addhelper, bench, crashhandler, cubecaps, cubereflex, extrawm, fadedesktop, firepaint, gears,
diff --git a/x11-plugins/compiz-plugins-main/metadata.xml b/x11-plugins/compiz-plugins-main/metadata.xml
index ff1fbd5dc8d73..d0cae3a592b12 100644
--- a/x11-plugins/compiz-plugins-main/metadata.xml
+++ b/x11-plugins/compiz-plugins-main/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-    <email>desktop-effects@gentoo.org</email>
-    <name>Desktop effects</name>
-  </maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 Package with the base compiz-fusion plugins:
 animation, colourfilter, expo, ezoom, jpeg, neg, opacify, put, resizeinfo, ring,
diff --git a/x11-themes/emerald-themes/metadata.xml b/x11-themes/emerald-themes/metadata.xml
index 1dcb8a7df4bbc..7035e9d628ba7 100644
--- a/x11-themes/emerald-themes/metadata.xml
+++ b/x11-themes/emerald-themes/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>desktop-effects@gentoo.org</email>
-	<name>Desktop effects</name>
-</maintainer>
-<longdescription lang="en">Emerald themes are the themes for emerald
-</longdescription>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">Emerald themes are the themes for emerald</longdescription>
 </pkgmetadata>
diff --git a/x11-wm/compiz-fusion/metadata.xml b/x11-wm/compiz-fusion/metadata.xml
index c7b7e6928eb33..3913b88811870 100644
--- a/x11-wm/compiz-fusion/metadata.xml
+++ b/x11-wm/compiz-fusion/metadata.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<!-- maintainer-needed -->
 <use>
   <flag name="emerald">Install the <pkg>x11-wm/emerald</pkg> package.</flag>
   <flag name="unsupported">Install the <pkg>x11-plugins/compiz-plugins-unsupported</pkg> package.</flag>
 </use>
-<maintainer type="project">
-  <email>desktop-effects@gentoo.org</email>
-  <name>Desktop effects</name>
-</maintainer>
 <longdescription>
 compiz-fusion is a community-driven project that is aimed at extending the compiz window manager.
 </longdescription>
diff --git a/x11-wm/compiz/metadata.xml b/x11-wm/compiz/metadata.xml
index 2d6941b7fe124..3c7523d479031 100644
--- a/x11-wm/compiz/metadata.xml
+++ b/x11-wm/compiz/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!-- maintainer-needed -->
   <use>
     <flag name="fuse">
       Enables support for the filesystem in userspace plugin through <pkg>sys-fs/fuse</pkg>.
@@ -11,10 +12,6 @@
       used.
     </flag>
   </use>
-  <maintainer type="project">
-    <email>desktop-effects@gentoo.org</email>
-    <name>Desktop effects</name>
-  </maintainer>
   <longdescription>
     compiz is a compositing window manager that uses 3D graphics acceleration via OpenGL.
   </longdescription>
diff --git a/x11-wm/emerald/metadata.xml b/x11-wm/emerald/metadata.xml
index 985c655b3f65d..8243e00ccf6bb 100644
--- a/x11-wm/emerald/metadata.xml
+++ b/x11-wm/emerald/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>desktop-effects@gentoo.org</email>
-	<name>Desktop effects</name>
-</maintainer>
-<longdescription lang="en">Emerald is a 3D window decorator for compositing window managers such as compiz.</longdescription>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">Emerald is a 3D window decorator for compositing window managers such as compiz.</longdescription>
 </pkgmetadata>