diff --git a/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
index f9cb424f6c..aa504d1936 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
@@ -2,6 +2,10 @@
 <!-- $FreeBSD$ -->
 
   <itemizedlist>
+    <listitem>
+      <para>&a.linimon; (2004 - 2013)</para>
+    </listitem>
+
     <listitem>
       <para>&a.pav; (2006 - 2012)</para>
     </listitem>
diff --git a/en_US.ISO8859-1/htdocs/administration.xml b/en_US.ISO8859-1/htdocs/administration.xml
index 18f1d951e7..bd77ce1447 100644
--- a/en_US.ISO8859-1/htdocs/administration.xml
+++ b/en_US.ISO8859-1/htdocs/administration.xml
@@ -129,7 +129,6 @@
     <li>&a.decke; &lt;<a href="mailto:decke@FreeBSD.org">decke@FreeBSD.org</a>&gt;</li>
     <li>&a.beat; &lt;<a href="mailto:beat@FreeBSD.org">beat@FreeBSD.org</a>&gt;</li>
     <li>&a.erwin; &lt;<a href="mailto:erwin@FreeBSD.org">erwin@FreeBSD.org</a>&gt;</li>
-    <li>&a.linimon; &lt;<a href="mailto:linimon@FreeBSD.org">linimon@FreeBSD.org</a>&gt;</li>
     <li>&a.itetcu; &lt;<a href="mailto:itetcu@FreeBSD.org">itetcu@FreeBSD.org</a>&gt;</li>
     <li>&a.miwi; &lt;<a href="mailto:miwi@FreeBSD.org">miwi@FreeBSD.org</a>&gt;</li>
   </ul>
@@ -344,7 +343,6 @@
     <li>&a.eadler; &lt; <a href="mailto:eadler@FreeBSD.org">eadler@FreeBSD.org</a>&gt;</li>
     <li>&a.gavin; &lt;<a href="mailto:gavin@FreeBSD.org">gavin@FreeBSD.org</a>&gt;</li>
     <li>&a.gonzo; &lt;<a href="mailto:gonzo@FreeBSD.org">gonzo@FreeBSD.org</a>&gt;</li>
-    <li>&a.linimon; &lt;<a href="mailto:linimon@FreeBSD.org">linimon@FreeBSD.org</a>&gt;</li>
   </ul>
 
   <h3><a name="t-clusteradm">Cluster Administrators</a>
diff --git a/share/xml/developers.ent b/share/xml/developers.ent
index eb3e84aa48..1d2f81be4e 100644
--- a/share/xml/developers.ent
+++ b/share/xml/developers.ent
@@ -713,7 +713,7 @@ $FreeBSD$
 <!-- Below we list the various hats. -->
 
 <!-- FreeBSD Bugmeister -->
-<!ENTITY a.bugmeister '&a.eadler;, &a.gavin;, &a.gonzo;, &a.linimon;'>
+<!ENTITY a.bugmeister '&a.eadler;, &a.gavin;, &a.gonzo;'>
 
 <!-- FreeBSD Doc Engineering Team -->
 <!ENTITY a.doceng '&a.gjb;, &a.blackend;, &a.gabor;, &a.hrs;'>
@@ -722,7 +722,7 @@ $FreeBSD$
 <!ENTITY a.donations '&a.tabthorpe;, &a.gjb;, &a.gahr;, &a.pgollucci;, &a.skreuzer;, &a.obrien;, &a.trhodes;, Daniel Seuffert, &a.rwatson;'>
 
 <!-- FreeBSD Ports Manager Team -->
-<!ENTITY a.portmgr '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.decke;, &a.beat;, &a.erwin;, &a.linimon;, &a.itetcu;, &a.miwi;'>
+<!ENTITY a.portmgr '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.decke;, &a.beat;, &a.erwin;, &a.itetcu;, &a.miwi;'>
 
 <!-- FreeBSD Release Engineering Teams -->
 <!ENTITY a.re.members '&a.kib;, &a.blackend;, &a.jpaetzel;, &a.hrs;, &a.kensmith;'>