diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index 8cecbdcb2d..933ea1a772 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -2245,10 +2245,10 @@
 <!-- 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 Core Team -->
-<!ENTITY a.core.members '&a.tabthorpe;, &a.gavin;, &a.jhb;, &a.kib;, &a.theraven;, &a.attilio;, &a.hrs;, &a.peter;, &a.miwi;'>
+<!ENTITY a.core.members '&a.tabthorpe;, &a.gavin;, &a.jhb;, &a.kib;, &a.theraven;, &a.hrs;, &a.peter;, &a.miwi;'>
 
 <!-- FreeBSD Doc Engineering Team -->
 <!ENTITY a.doceng.members '&a.gjb;, &a.blackend;, &a.gabor;, &a.hrs;'>
@@ -2257,15 +2257,15 @@
 <!ENTITY a.donations.members '&a.tabthorpe;, &a.gjb;, &a.gahr;, &a.pgollucci;, &a.skreuzer;, &a.obrien;, &a.trhodes;, &a.ds;, &a.rwatson;'>
 
 <!-- FreeBSD Ports Manager Team -->
-<!ENTITY a.portmgr.members '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.decke;, &a.beat;, &a.erwin;, &a.linimon;, &a.itetcu;, &a.miwi;'>
+<!ENTITY a.portmgr.members '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.bdrewery;, &a.decke;, &a.erwin;, &a.itetcu;, &a.miwi;'>
 
 <!-- FreeBSD Release Engineering Teams -->
 <!ENTITY a.re "re@FreeBSD.org">
-<!ENTITY a.re.members '&a.kib;, &a.blackend;, &a.jpaetzel;, &a.hrs;, &a.kensmith;'>
-<!ENTITY a.re.members.email '&a.kib.email;, &a.blackend.email;, &a.jpaetzel.email;, &a.hrs.email;, &a.kensmith.email;'>
+<!ENTITY a.re.members '&a.mva;, &a.gjb;, &a.kib;, &a.joel;, &a.blackend;, &a.skreuzer;, &a.delphij;, &a.jpaetzel;, &a.rodrigc;, &a.hrs;, &a.glebius;, &a.kensmith;, &a.marius;'>
+<!ENTITY a.re.members.email '&a.mva.email;, &a.gjb.email;, &a.kib.email;, &a.joel.email;, &a.blackend.email;, &a.skreuzer.email;, &a.delphij.email;, &a.jpaetzel.email;, &a.rodrigc.email;, &a.hrs.email;, &a.glebius.email;, &a.kensmith.email;, &a.marius.email;'>
 <!ENTITY a.re-builders '&a.marcel;, &a.nyan;, &a.nwhitehorn;'>
 
 <!-- FreeBSD Security Officer -->
-<!ENTITY a.so '&a.simon;'>
+<!ENTITY a.so '&a.des;'>
 
 <!ENTITY a.so-team '&a.mnag;, &a.remko;, &a.gnn;, &a.simon;, &a.philip;, &a.cperciva;, &a.csjp;, &a.des;, &a.rwatson;, &a.bz;'>