diff --git a/app-emacs/eselect-mode/metadata.xml b/app-emacs/eselect-mode/metadata.xml
index 086243897e261..aa236e8ff61df 100644
--- a/app-emacs/eselect-mode/metadata.xml
+++ b/app-emacs/eselect-mode/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer type="project">
+  <email>eselect@gentoo.org</email>
+  <name>eselect configuration and management tool</name>
+</maintainer>
 <maintainer type="project">
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
 <stabilize-allarches/>
 <upstream>
-  <maintainer status="active">
-    <email>eselect@gentoo.org</email>
-    <name>eselect configuration and management tool</name>
-  </maintainer>
+  <remote-id type="gentoo">proj/eselect</remote-id>
 </upstream>
 </pkgmetadata>