diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
index 01650e1a44..14ecf67e75 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
@@ -1,1252 +1,1256 @@
 <!-- $FreeBSD$ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
 	adding your entity to the list of developers.
 -->
 
   <itemizedlist>
     <listitem>
       <para>&a.akiyama;</para>
     </listitem>
     
     <listitem>
       <para>&a.jmas;</para>
     </listitem>
     
     <listitem>
       <para>&a.ambrisko;</para>
     </listitem>
     
     <listitem>
       <para>&a.will;</para>
     </listitem>
     
     <listitem>
       <para>&a.anholt;</para>
     </listitem>
     
     <listitem>
       <para>&a.mat;</para>
     </listitem>
     
     <listitem>
       <para>&a.babkin;</para>
     </listitem>
     
     <listitem>
       <para>&a.dbaker;</para>
     </listitem>
     
     <listitem>
       <para>&a.jhb;</para>
     </listitem>
     
     <listitem>
       <para>&a.dmlb;</para>
     </listitem>
     
     <listitem>
       <para>&a.mike;</para>
     </listitem>
     
     <listitem>
       <para>&a.dougb;</para>
     </listitem>
     
     <listitem>
       <para>&a.tobez;</para>
     </listitem>
     
     <listitem>
       <para>&a.pb;</para>
     </listitem>
     
     <listitem>
       <para>&a.abial;</para>
     </listitem>
     
     <listitem>
       <para>&a.jb;</para>
     </listitem>
     
     <listitem>
       <para>&a.nbm;</para>
     </listitem>
     
     <listitem>
       <para>&a.mbr;</para>
     </listitem>
     
     <listitem>
       <para>&a.torstenb;</para>
     </listitem>
     
     <listitem>
       <para>&a.mb;</para>
     </listitem>
     
     <listitem>
       <para>&a.harti;</para>
     </listitem>
     
     <listitem>
       <para>&a.obraun;</para>
     </listitem>
     
     <listitem>
       <para>&a.jmb;</para>
     </listitem>
     
     <listitem>
       <para>&a.brueffer;</para>
     </listitem>
     
     <listitem>
       <para>&a.wilko;</para>
     </listitem>
     
     <listitem>
       <para>&a.jake;</para>
     </listitem>
     
     <listitem>
       <para>&a.dburr;</para>
     </listitem>
     
     <listitem>
       <para>&a.adrian;</para>
     </listitem>
     
     <listitem>
       <para>&a.perky;</para>
     </listitem>
     
     <listitem>
       <para>&a.dwcjr;</para>
     </listitem>
     
     <listitem>
       <para>&a.charnier;</para>
     </listitem>
     
     <listitem>
       <para>&a.jon;</para>
     </listitem>
     
     <listitem>
       <para>&a.luoqi;</para>
     </listitem>
     
     <listitem>
       <para>&a.ache;</para>
     </listitem>
     
     <listitem>
       <para>&a.seanc;</para>
     </listitem>
     
     <listitem>
       <para>&a.kjc;</para>
     </listitem>
     
     <listitem>
       <para>&a.cjh;</para>
     </listitem>
     
     <listitem>
       <para>&a.cjc;</para>
     </listitem>
     
     <listitem>
       <para>&a.marcus;</para>
     </listitem>
     
     <listitem>
       <para>&a.nik;</para>
     </listitem>
     
     <listitem>
       <para>&a.archie;</para>
     </listitem>
     
     <listitem>
       <para>&a.chris;</para>
     </listitem>
     
     <listitem>
       <para>&a.alc;</para>
     </listitem>
     
     <listitem>
       <para>&a.cracauer;</para>
     </listitem>
     
     <listitem>
       <para>&a.dec;</para>
     </listitem>
     
     <listitem>
       <para>&a.davidc;</para>
     </listitem>
     
     <listitem>
       <para>&a.ceri;</para>
     </listitem>
     
     <listitem>
       <para>&a.brooks;</para>
     </listitem>
     
     <listitem>
       <para>&a.bsd;</para>
     </listitem>
     
     <listitem>
       <para>&a.jwd;</para>
     </listitem>
     
     <listitem>
       <para>&a.pdeuskar;</para>
     </listitem>
     
     <listitem>
       <para>&a.mdodd;</para>
     </listitem>
     
     <listitem>
       <para>&a.dd;</para>
     </listitem>
     
     <listitem>
       <para>&a.iedowse;</para>
     </listitem>
     
     <listitem>
       <para>&a.robert;</para>
     </listitem>
     
     <listitem>
       <para>&a.gad;</para>
     </listitem>
     
     <listitem>
       <para>&a.uhclem;</para>
     </listitem>
     
     <listitem>
       <para>&a.tegge;</para>
     </listitem>
     
     <listitem>
       <para>&a.deischen;</para>
     </listitem>
     
     <listitem>
       <para>&a.eivind;</para>
     </listitem>
     
     <listitem>
       <para>&a.julian;</para>
     </listitem>
     
     <listitem>
       <para>&a.rse;</para>
     </listitem>
     
     <listitem>
       <para>&a.ue;</para>
     </listitem>
     
     <listitem>
       <para>&a.ru;</para>
     </listitem>
     
     <listitem>
       <para>&a.se;</para>
     </listitem>
     
     <listitem>
       <para>&a.bde;</para>
     </listitem>
     
     <listitem>
       <para>&a.sef;</para>
     </listitem>
     
     <listitem>
       <para>&a.jedgar;</para>
     </listitem>
     
     <listitem>
       <para>&a.green;</para>
     </listitem>
     
     <listitem>
       <para>&a.fenner;</para>
     </listitem>
     
     <listitem>
       <para>&a.lioux;</para>
     </listitem>
     
     <listitem>
       <para>&a.fanf;</para>
     </listitem>
     
     <listitem>
       <para>&a.blackend;</para>
     </listitem>
     
     <listitem>
       <para>&a.scrappy;</para>
     </listitem>
     
     <listitem>
       <para>&a.lars;</para>
     </listitem>
     
     <listitem>
       <para>&a.petef;</para>
     </listitem>
     
     <listitem>
       <para>&a.dirk;</para>
     </listitem>
     
     <listitem>
       <para>&a.sf;</para>
     </listitem>
     
     <listitem>
       <para>&a.shige;</para>
     </listitem>
     
     <listitem>
       <para>&a.billf;</para>
     </listitem>
     
     <listitem>
       <para>&a.furuta;</para>
     </listitem>
     
     <listitem>
       <para>&a.gallatin;</para>
     </listitem>
     
     <listitem>
       <para>&a.patrick;</para>
     </listitem>
     
     <listitem>
       <para>&a.tg;</para>
     </listitem>
     
     <listitem>
       <para>&a.gibbs;</para>
     </listitem>
     
     <listitem>
       <para>&a.brandon;</para>
     </listitem>
     
     <listitem>
       <para>&a.gioria;</para>
     </listitem>
     
     <listitem>
       <para>&a.daichi;</para>
     </listitem>
     
     <listitem>
       <para>&a.cg;</para>
     </listitem>
     
     <listitem>
       <para>&a.edwin;</para>
     </listitem>
     
     <listitem>
       <para>&a.jmg;</para>
     </listitem>
     
     <listitem>
       <para>&a.znerd;</para>
     </listitem>
     
     <listitem>
       <para>&a.hanai;</para>
     </listitem>
     
     <listitem>
       <para>&a.roger;</para>
     </listitem>
     
     <listitem>
       <para>&a.mharo;</para>
     </listitem>
     
     <listitem>
       <para>&a.dannyboy;</para>
     </listitem>
     
     <listitem>
       <para>&a.jhay;</para>
     </listitem>
     
     <listitem>
       <para>&a.sheldonh;</para>
     </listitem>
     
     <listitem>
       <para>&a.mikeh;</para>
     </listitem>
     
     <listitem>
       <para>&a.mheinen;</para>
     </listitem>
     
     <listitem>
       <para>&a.ghelmer;</para>
     </listitem>
     
     <listitem>
       <para>&a.mux;</para>
     </listitem>
     
     <listitem>
       <para>&a.chm;</para>
     </listitem>
     
     <listitem>
       <para>&a.nhibma;</para>
     </listitem>
     
     <listitem>
       <para>&a.flathill;</para>
     </listitem>
     
     <listitem>
       <para>&a.orion;</para>
     </listitem>
     
     <listitem>
       <para>&a.horikawa;</para>
     </listitem>
     
     <listitem>
       <para>&a.hosokawa;</para>
     </listitem>
     
     <listitem>
       <para>&a.mich;</para>
     </listitem>
     
     <listitem>
       <para>&a.cognet;</para>
     </listitem>
     
     <listitem>
       <para>&a.jeh;</para>
     </listitem>
     
     <listitem>
       <para>&a.hsu;</para>
     </listitem>
     
     <listitem>
       <para>&a.foxfair;</para>
     </listitem>
     
     <listitem>
       <para>&a.jkh;</para>
     </listitem>
     
     <listitem>
       <para>&a.tom;</para>
     </listitem>
     
     <listitem>
       <para>&a.mph;</para>
     </listitem>
     
     <listitem>
       <para>&a.iwasaki;</para>
     </listitem>
     
     <listitem>
       <para>&a.mjacob;</para>
     </listitem>
     
     <listitem>
       <para>&a.keith;</para>
     </listitem>
     
     <listitem>
       <para>&a.gj;</para>
     </listitem>
     
     <listitem>
       <para>&a.trevor;</para>
     </listitem>
     
     <listitem>
       <para>&a.kan;</para>
     </listitem>
     
     <listitem>
       <para>&a.phk;</para>
     </listitem>
     
     <listitem>
       <para>&a.tomsoft;</para>
     </listitem>
     
     <listitem>
       <para>&a.cokane;</para>
     </listitem>
     
     <listitem>
       <para>&a.johan;</para>
     </listitem>
     
     <listitem>
       <para>&a.joe;</para>
     </listitem>
     
     <listitem>
       <para>&a.kato;</para>
     </listitem>
     
     <listitem>
       <para>&a.smkelly;</para>
     </listitem>
     
     <listitem>
       <para>&a.kris;</para>
     </listitem>
     
     <listitem>
       <para>&a.keramida;</para>
     </listitem>
     
     <listitem>
       <para>&a.kientzle;</para>
     </listitem>
    
     <listitem>
       <para>&a.fjoe;</para>
     </listitem>
     
     <listitem>
       <para>&a.kiri;</para>
     </listitem>
     
     <listitem>
       <para>&a.andreas;</para>
     </listitem>
     
     <listitem>
       <para>&a.ikob;</para>
     </listitem>
     
     <listitem>
       <para>&a.lkoeller;</para>
     </listitem>
     
     <listitem>
       <para>&a.motoyuki;</para>
     </listitem>
     
     <listitem>
       <para>&a.maxim;</para>
     </listitem>
     
     <listitem>
       <para>&a.jkoshy;</para>
     </listitem>
     
     <listitem>
       <para>&a.rushani;</para>
     </listitem>
     
     <listitem>
       <para>&a.kuriyama;</para>
     </listitem>
     
     <listitem>
       <para>&a.alex;</para>
     </listitem>
     
     <listitem>
       <para>&a.erwin;</para>
     </listitem>
     
     <listitem>
       <para>&a.njl;</para>
     </listitem>
     
     <listitem>
       <para>&a.reg;</para>
     </listitem>
     
     <listitem>
       <para>&a.chern;</para>
     </listitem>
     
     <listitem>
       <para>&a.leeym;</para>
     </listitem>
     
     <listitem>
       <para>&a.sam;</para>
     </listitem>
     
     <listitem>
       <para>&a.stephane;</para>
     </listitem>
     
     <listitem>
       <para>&a.oliver;</para>
     </listitem>
     
     <listitem>
       <para>&a.netchild;</para>
     </listitem>
     
     <listitem>
       <para>&a.jlemon;</para>
     </listitem>
     
     <listitem>
       <para>&a.truckman;</para>
     </listitem>
     
     <listitem>
       <para>&a.glewis;</para>
     </listitem>
     
     <listitem>
       <para>&a.pat;</para>
     </listitem>
     
     <listitem>
       <para>&a.ijliao;</para>
     </listitem>
     
     <listitem>
       <para>&a.clive;</para>
     </listitem>
     
     <listitem>
       <para>&a.arved;</para>         
     </listitem>
     
     <listitem>
       <para>&a.kevlo;</para>
     </listitem>
     
     <listitem>
       <para>&a.scottl;</para>
     </listitem>
     
     <listitem>
       <para>&a.ade;</para>
     </listitem>
     
     <listitem>
       <para>&a.mwlucas;</para>
     </listitem>
     
     <listitem>
       <para>&a.smace;</para>
     </listitem>
     
     <listitem>
       <para>&a.bmah;</para>
     </listitem>
     
     <listitem>
       <para>&a.mtm;</para>
     </listitem>
     
     <listitem>
       <para>&a.jmallett;</para>
     </listitem>
     
     <listitem>
       <para>&a.dwmalone;</para>
     </listitem>
     
     <listitem>
       <para>&a.nobutaka;</para>
     </listitem>
     
     <listitem>
       <para>&a.matusita;</para>
     </listitem>
     
     <listitem>
       <para>&a.mckay;</para>
     </listitem>
     
     <listitem>
       <para>&a.mckusick;</para>
     </listitem>
     
     <listitem>
       <para>&a.eric;</para>
     </listitem>
     
     <listitem>
       <para>&a.ken;</para>
     </listitem>
     
     <listitem>
       <para>&a.dinoex;</para>
     </listitem>
     
     <listitem>
       <para>&a.hm;</para>
     </listitem>
     
     <listitem>
       <para>&a.sanpei;</para>
     </listitem>
     
     <listitem>
       <para>&a.bmilekic;</para>
     </listitem>
     
     <listitem>
       <para>&a.mini;</para>
     </listitem>
     
     <listitem>
       <para>&a.mita;</para>
     </listitem>
     
     <listitem>
       <para>&a.non;</para>
     </listitem>
     
     <listitem>
       <para>&a.jim;</para>
     </listitem>
     
     <listitem>
       <para>&a.marcel;</para>
     </listitem>
     
     <listitem>
       <para>&a.emoore;</para>
     </listitem>
     
     <listitem>
       <para>&a.amorita;</para>
     </listitem>
     
     <listitem>
       <para>&a.dan;</para>
     </listitem>
     
     <listitem>
       <para>&a.tmm;</para>
     </listitem>
     
     <listitem>
       <para>&a.markm;</para>
     </listitem>
     
     <listitem>
       <para>&a.knu;</para>
     </listitem>
     
     <listitem>
       <para>&a.nakai;</para>
     </listitem>
     
     <listitem>
       <para>&a.max;</para>
     </listitem>
     
     <listitem>
       <para>&a.maho;</para>
     </listitem>
     
     <listitem>
       <para>&a.yoichi;</para>
     </listitem>
 
     <listitem>
       <para>&a.bland;</para>
     </listitem>
     
     <listitem>
       <para>&a.simon;</para>
     </listitem>
 
     <listitem>
       <para>&a.anders;</para>
     </listitem>
     
     <listitem>
       <para>&a.rnordier;</para>
     </listitem>
 
     <listitem>
       <para>&a.lofi;</para>
     </listitem>
 
     <listitem>
       <para>&a.obrien;</para>
     </listitem>
     
     <listitem>
       <para>&a.danny;</para>
     </listitem>
     
     <listitem>
       <para>&a.okazaki;</para>
     </listitem>
     
     <listitem>
       <para>&a.olgeni;</para>
     </listitem>
     
     <listitem>
       <para>&a.onoe;</para>
     </listitem>
     
     <listitem>
       <para>&a.osa;</para>
     </listitem>
     
     <listitem>
       <para>&a.hmp;</para>
     </listitem>
     
     <listitem>
       <para>&a.wpaul;</para>
     </listitem>
     
     <listitem>
       <para>&a.mp;</para>
     </listitem>
     
     <listitem>
       <para>&a.roam;</para>
     </listitem>
     
     <listitem>
       <para>&a.den;</para>
     </listitem>
     
     <listitem>
       <para>&a.alfred;</para>
     </listitem>
     
     <listitem>
       <para>&a.wes;</para>
     </listitem>
     
     <listitem>
       <para>&a.gerald;</para>
     </listitem>
     
     <listitem>
       <para>&a.jdp;</para>
     </listitem>
     
     <listitem>
       <para>&a.bp;</para>
     </listitem>
 
     <listitem>
       <para>&a.krion;</para>
     </listitem>
     
     <listitem>
       <para>&a.rpratt;</para>
     </listitem>
     
     <listitem>
       <para>&a.steve;</para>
     </listitem>
     
     <listitem>
       <para>&a.mpp;</para>
     </listitem>
     
     <listitem>
       <para>&a.markp;</para>
     </listitem>
     
     <listitem>
       <para>&a.thomas;</para>
     </listitem>
     
     <listitem>
       <para>&a.darrenr;</para>
     </listitem>
     
     <listitem>
       <para>&a.greid;</para>
     </listitem>
     
     <listitem>
       <para>&a.mr;</para>
     </listitem>
     
     <listitem>
       <para>&a.arr;</para>
     </listitem>
     
     <listitem>
       <para>&a.trhodes;</para>
     </listitem>
     
     <listitem>
       <para>&a.benno;</para>
     </listitem>
     
     <listitem>
       <para>&a.paul;</para>
     </listitem>
     
     <listitem>
       <para>&a.luigi;</para>
     </listitem>
     
     <listitem>
       <para>&a.tjr;</para>
     </listitem>
     
     <listitem>
       <para>&a.jeff;</para>
     </listitem>
     
     <listitem>
       <para>&a.roberto;</para>
     </listitem>
     
     <listitem>
       <para>&a.chuckr;</para>
     </listitem>
     
     <listitem>
       <para>&a.jesusr;</para>
     </listitem>
     
     <listitem>
       <para>&a.guido;</para>
     </listitem>
     
     <listitem>
       <para>&a.groudier;</para>
     </listitem>
     
     <listitem>
       <para>&a.dima;</para>
     </listitem>
     
     <listitem>
       <para>&a.ps;</para>
     </listitem>
     
     <listitem>
       <para>&a.sada;</para>
     </listitem>
     
     <listitem>
       <para>&a.hrs;</para>
     </listitem>
     
     <listitem>
       <para>&a.nsayer;</para>
     </listitem>
     
     <listitem>
       <para>&a.sos;</para>
     </listitem>
     
     <listitem>
       <para>&a.wosch;</para>
     </listitem>
     
     <listitem>
       <para>&a.cy;</para>
     </listitem>
     
     <listitem>
       <para>&a.das;</para>
     </listitem>
     
     <listitem>
       <para>&a.schweikh;</para>
     </listitem>
     
     <listitem>
       <para>&a.lev;</para>
     </listitem>
     
     <listitem>
       <para>&a.gshapiro;</para>
     </listitem>
     
     <listitem>
       <para>&a.arun;</para>
     </listitem>
     
     <listitem>
       <para>&a.shiba;</para>
     </listitem>
     
     <listitem>
       <para>&a.nork;</para>
     </listitem>
     
     <listitem>
       <para>&a.tshiozak;</para>
     </listitem>
     
     <listitem>
       <para>&a.simokawa;</para>
     </listitem>
     
     <listitem>
       <para>&a.vanilla;</para>
     </listitem>
     
     <listitem>
       <para>&a.cshumway;</para>
     </listitem>
     
     <listitem>
       <para>&a.silby;</para>
     </listitem>
     
     <listitem>
       <para>&a.bms;</para>
     </listitem>
     
     <listitem>
       <para>&a.shafeeq;</para>
     </listitem>
     
     <listitem>
       <para>&a.demon;</para>
     </listitem>
     
     <listitem>
       <para>&a.jesper;</para>
     </listitem>
     
     <listitem>
       <para>&a.skv;</para>
     </listitem>
     
     <listitem>
       <para>&a.scop;</para>
     </listitem>
     
     <listitem>
       <para>&a.kensmith;</para>
     </listitem>
     
     <listitem>
       <para>&a.msmith;</para>
     </listitem>
     
     <listitem>
       <para>&a.ben;</para>
     </listitem>
     
     <listitem>
       <para>&a.des;</para>
     </listitem>
     
     <listitem>
       <para>&a.sobomax;</para>
     </listitem>
     
     <listitem>
       <para>&a.dcs;</para>
     </listitem>
     
     <listitem>
       <para>&a.brian;</para>
     </listitem>
     
     <listitem>
       <para>&a.nsouch;</para>
     </listitem>
     
     <listitem>
       <para>&a.dds;</para>
     </listitem>
     
     <listitem>
       <para>&a.murray;</para>
     </listitem>
     
     <listitem>
       <para>&a.sumikawa;</para>
     </listitem>
     
     <listitem>
       <para>&a.gsutter;</para>
     </listitem>
     
     <listitem>
       <para>&a.suz;</para>
     </listitem>
     
     <listitem>
       <para>&a.unfurl;</para>
     </listitem>
     
     <listitem>
       <para>&a.nyan;</para>
     </listitem>
     
     <listitem>
       <para>&a.tanimura;</para>
     </listitem>
     
     <listitem>
       <para>&a.taoka;</para>
     </listitem>
     
     <listitem>
       <para>&a.mi;</para>
     </listitem>
     
     <listitem>
       <para>&a.gordon;</para>
     </listitem>
     
     <listitem>
       <para>&a.yar;</para>
     </listitem>
     
     <listitem>
       <para>&a.cwt;</para>
     </listitem>
     
     <listitem>
       <para>&a.ume;</para>
     </listitem>
     
     <listitem>
       <para>&a.semenu;</para>
     </listitem>
     
     <listitem>
       <para>&a.rv;</para>
     </listitem>
     
     <listitem>
       <para>&a.hoek;</para>
     </listitem>
     
     <listitem>
       <para>&a.logo;</para>
     </listitem>
     
     <listitem>
       <para>&a.nectar;</para>
     </listitem>
     
     <listitem>
       <para>&a.jayanth;</para>
     </listitem>
     
     <listitem>
       <para>&a.wjv;</para>
     </listitem>
     
     <listitem>
       <para>&a.bean;</para>
     </listitem>
     
     <listitem>
       <para>&a.ticso;</para>
     </listitem>
     
     <listitem>
       <para>&a.takawata;</para>
     </listitem>
     
     <listitem>
       <para>&a.adamw;</para>
     </listitem>
     
     <listitem>
       <para>&a.naddy;</para>
     </listitem>
     
     <listitem>
       <para>&a.assar;</para>
     </listitem>
     
     <listitem>
       <para>&a.dwhite;</para>
     </listitem>
     
     <listitem>
       <para>&a.nate;</para>
     </listitem>
     
     <listitem>
       <para>&a.wollman;</para>
     </listitem>
     
     <listitem>
       <para>&a.keichii;</para>
     </listitem>
     
     <listitem>
       <para>&a.joerg;</para>
     </listitem>
     
     <listitem>
       <para>&a.kbyanc;</para>
     </listitem>
     
     <listitem>
       <para>&a.jennifer;</para>
     </listitem>
+
+    <listitem>
+      <para>&a.emax;</para>
+    </listitem>
     
     <listitem>
       <para>&a.yokota;</para>
     </listitem>
     
     <listitem>
       <para>&a.andy;</para>
     </listitem>
     
     <listitem>
       <para>&a.zarzycki;</para>
     </listitem>
     
     <listitem>
       <para>&a.phantom;</para>
     </listitem>
     
     <listitem>
       <para>&a.jmz;</para>
     </listitem>
   </itemizedlist>
   
 <!-- 
   Local Variables:
   mode: sgml
   sgml-declaration: "chapter.decl"
   sgml-indent-data: t
   sgml-omittag: nil
   sgml-always-quote-attributes: t
   sgml-parent-document: ("article.sgml" "part" "sect1")
   End:
 -->
   
diff --git a/en_US.ISO8859-1/share/sgml/authors.ent b/en_US.ISO8859-1/share/sgml/authors.ent
index de530c3d05..22d5c91f0a 100644
--- a/en_US.ISO8859-1/share/sgml/authors.ent
+++ b/en_US.ISO8859-1/share/sgml/authors.ent
@@ -1,792 +1,794 @@
 <!--
      Names and email address of contributing authors and CVS committers.
      Entity names for committers should be the same as their login names on
      freefall.FreeBSD.org.
 
      Use these entities when referencing people.
 
      Please keep this list in alphabetical order by entity names.
 
      IMPORTANT:  If you delete names from this file you *must* ensure that
                  all references to them have been removed from the handbook's
                  translations.  If they haven't then you *will* break the
                  builds for the other languages, and we will poke fun of you
                  in public.
 
      $FreeBSD$
 -->
 
 <!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.org</email>">
 
 <!ENTITY a.ache "Andrey A. Chernov <email>ache@FreeBSD.org</email>">
 
 <!ENTITY a.adam "Adam David <email>adam@FreeBSD.org</email>">
 
 <!ENTITY a.adamw "Adam Weinberger <email>adamw@FreeBSD.org</email>">
 
 <!ENTITY a.ade "Ade Lovett <email>ade@FreeBSD.org</email>">
 
 <!ENTITY a.adrian "Adrian Chadd <email>adrian@FreeBSD.org</email>">
 
 <!ENTITY a.akiyama "Shunsuke Akiyama <email>akiyama@FreeBSD.org</email>">
 
 <!ENTITY a.alane "Alan Eldridge <email>alane@FreeBSD.org</email>">
 
 <!ENTITY a.alc "Alan L. Cox <email>alc@FreeBSD.org</email>">
 
 <!ENTITY a.alex "Alexander Langer <email>alex@FreeBSD.org</email>">
 
 <!ENTITY a.alfred "Alfred Perlstein <email>alfred@FreeBSD.org</email>">
 
 <!ENTITY a.ambrisko "Doug Ambrisko <email>ambrisko@FreeBSD.org</email>">
 
 <!ENTITY a.amorita "Akio Morita <email>amorita@FreeBSD.org</email>">
 
 <!ENTITY a.amurai "Atsushi Murai <email>amurai@FreeBSD.org</email>">
 
 <!ENTITY a.anders "Anders Nordby <email>anders@FreeBSD.org</email>">
 
 <!ENTITY a.andreas "Andreas Klemm <email>andreas@FreeBSD.org</email>">
 
 <!ENTITY a.andy "Andrey Zakhvatov <email>andy@FreeBSD.org</email>">
 
 <!ENTITY a.anholt "Eric Anholt <email>anholt@FreeBSD.org</email>">
 
 <!ENTITY a.archie "Archie Cobbs <email>archie@FreeBSD.org</email>">
 
 <!ENTITY a.arr "Andrew R. Reiter <email>arr@FreeBSD.org</email>">
 
 <!ENTITY a.arun "Arun Sharma <email>arun@FreeBSD.org</email>">
 
 <!ENTITY a.arved "Tilman Linneweh <email>arved@FreeBSD.org</email>">
 
 <!ENTITY a.asami "Satoshi Asami <email>asami@FreeBSD.org</email>">
 
 <!ENTITY a.asmodai "Jeroen Ruigrok/Asmodai <email>asmodai@FreeBSD.org</email>">
 
 <!ENTITY a.assar "Assar Westerlund <email>assar@FreeBSD.org</email>">
 
 <!ENTITY a.awebster "Andrew Webster <email>awebster@pubnix.net</email>">
 
 <!ENTITY a.babkin "Sergey Babkin <email>babkin@FreeBSD.org</email>">
 
 <!ENTITY a.bbraun "Rob Braun <email>bbraun@FreeBSD.org</email>">
 
 <!ENTITY a.bde "Bruce Evans <email>bde@FreeBSD.org</email>">
 
 <!ENTITY a.bean "Rebecca Visger <email>bean@FreeBSD.org</email>">
 
 <!ENTITY a.ben "Ben Smithurst <email>ben@FreeBSD.org</email>">
 
 <!ENTITY a.benno "Benno Rice <email>benno@FreeBSD.org</email>">
 
 <!ENTITY a.billf "Bill Fumerola <email>billf@FreeBSD.org</email>">
 
 <!ENTITY a.blackend "Marc Fonvieille <email>blackend@FreeBSD.org</email>">
 
 <!ENTITY a.bland "Alexander Nedotsukov <email>bland@FreeBSD.org</email>">
 
 <!ENTITY a.bmah "Bruce A. Mah <email>bmah@FreeBSD.org</email>">
 
 <!ENTITY a.bmilekic "Bosko Milekic <email>bmilekic@FreeBSD.org</email>">
 
 <!ENTITY a.bms "Bruce M. Simpson <email>bms@FreeBSD.org</email>">
 
 <!ENTITY a.bp "Boris Popov <email>bp@FreeBSD.org</email>">
 
 <!ENTITY a.brandon "Brandon Gillespie <email>brandon@FreeBSD.org</email>">
 
 <!ENTITY a.brian "Brian Somers <email>brian@FreeBSD.org</email>">
 
 <!ENTITY a.brooks "Brooks Davis <email>brooks@FreeBSD.org</email>">
 
 <!ENTITY a.bsd "Brian S. Dean <email>bsd@FreeBSD.org</email>">
 
 <!ENTITY a.cawimm "Charles A. Wimmer <email>cawimm@FreeBSD.org</email>">
 
 <!ENTITY a.ceri "Ceri Davies <email>ceri@FreeBSD.org</email>">
 
 <!ENTITY a.cg "Cameron Grant <email>cg@FreeBSD.org</email>">
 
 <!ENTITY a.charnier "Philippe Charnier <email>charnier@FreeBSD.org</email>">
 
 <!ENTITY a.chern "Chern Lee <email>chern@FreeBSD.org</email>">
 
 <!ENTITY a.brueffer "Christian Br&uuml;ffer <email>brueffer@FreeBSD.org</email>">
 
 <!ENTITY a.chm "Christoph Herrmann <email>chm@FreeBSD.org</email>">
 
 <!ENTITY a.chris "Chris Costello <email>chris@FreeBSD.org</email>">
 
 <!ENTITY a.chuckr "Chuck Robey <email>chuckr@FreeBSD.org</email>">
 
 <!ENTITY a.cjc "Crist J. Clark <email>cjc@FreeBSD.org</email>">
 
 <!ENTITY a.cjh "Junho CHOI <email>cjh@FreeBSD.org</email>">
 
 <!ENTITY a.clive "Clive Lin <email>clive@FreeBSD.org</email>">
 
 <!ENTITY a.cognet "Olivier Houchard <email>cognet@FreeBSD.org</email>">
 
 <!ENTITY a.cokane "Coleman Kane <email>cokane@FreeBSD.org</email>">
 
 <!ENTITY a.cp "Chuck Paterson <email>cp@FreeBSD.org</email>">
 
 <!ENTITY a.cpiazza "Chris Piazza <email>cpiazza@FreeBSD.org</email>">
 
 <!ENTITY a.cracauer "Martin Cracauer <email>cracauer@FreeBSD.org</email>">
 
 <!ENTITY a.csgr "Geoff Rehmet <email>csgr@FreeBSD.org</email>">
 
 <!ENTITY a.cshumway "Christopher Shumway <email>cshumway@FreeBSD.org</email>">
 
 <!ENTITY a.cwt "Chris Timmons <email>cwt@FreeBSD.org</email>">
 
 <!ENTITY a.cy "Cy Schubert <email>cy@FreeBSD.org</email>">
 
 <!ENTITY a.daichi "Daichi GOTO <email>daichi@FreeBSD.org</email>">
 
 <!ENTITY a.dan "Dan Moschuk <email>dan@FreeBSD.org</email>">
 
 <!ENTITY a.danny "Daniel O'Callaghan <email>danny@FreeBSD.org</email>">
 
 <!ENTITY a.dannyboy "Daniel Harris <email>dannyboy@FreeBSD.org</email>">
 
 <!ENTITY a.darrenr "Darren Reed <email>darrenr@FreeBSD.org</email>">
 
 <!ENTITY a.das "David Schultz <email>das@FreeBSD.org</email>">
 
 <!ENTITY a.davidc "Chad David <email>davidc@FreeBSD.org</email>">
 
 <!ENTITY a.davidn "David Nugent <email>davidn@FreeBSD.org</email>">
 
 <!ENTITY a.davidxu "David Xu <email>davidxu@FreeBSD.org</email>">
 
 <!ENTITY a.dbaker "Daniel Baker <email>dbaker@FreeBSD.org</email>">
 
 <!ENTITY a.dburr "Donald Burr <email>dburr@FreeBSD.org</email>">
 
 <!ENTITY a.dcs "Daniel C. Sobral <email>dcs@FreeBSD.org</email>">
 
 <!ENTITY a.dd "Dima Dorfman <email>dd@FreeBSD.org</email>">
 
 <!ENTITY a.dds "Diomidis D. Spinellis <email>dds@FreeBSD.org</email>">
 
 <!ENTITY a.dec "David E. Cross <email>dec@FreeBSD.org</email>">
 
 <!ENTITY a.deischen "Daniel Eischen <email>deischen@FreeBSD.org</email>">
 
 <!ENTITY a.demon "Dmitry Sivachenko <email>demon@FreeBSD.org</email>">
 
 <!ENTITY a.den "Denis Peplin <email>den@FreeBSD.org</email>">
 
 <!ENTITY a.des "Dag-Erling C. Sm&oslash;rgrav <email>des@FreeBSD.org</email>">
 
 <!ENTITY a.dfr "Doug Rabson <email>dfr@FreeBSD.org</email>">
 
 <!ENTITY a.dg "David Greenman <email>dg@FreeBSD.org</email>">
 
 <!ENTITY a.dick "Richard Seaman Jr. <email>dick@FreeBSD.org</email>">
 
 <!ENTITY a.dillon "Matthew Dillon <email>dillon@FreeBSD.org</email>">
 
 <!ENTITY a.dima "Dima Ruban <email>dima@FreeBSD.org</email>">
 
 <!ENTITY a.dinoex "Dirk Meyer <email>dinoex@FreeBSD.org</email>">
 
 <!ENTITY a.dirk "Dirk Fr&ouml;mberg <email>dirk@FreeBSD.org</email>">
 
 <!ENTITY a.dmlb "Duncan Barclay <email>dmlb@FreeBSD.org</email>">
 
 <!ENTITY a.dougb "Doug Barton <email>DougB@FreeBSD.org</email>">
 
 <!ENTITY a.dt "Dmitrij Tejblum <email>dt@FreeBSD.org</email>">
 
 <!ENTITY a.dufault "Peter Dufault <email>dufault@FreeBSD.org</email>">
 
 <!ENTITY a.dwcjr "David W. Chapman Jr. <email>dwcjr@FreeBSD.org</email>">
 
 <!ENTITY a.dwhite "Doug White <email>dwhite@FreeBSD.org</email>">
 
 <!ENTITY a.dwmalone "David Malone <email>dwmalone@FreeBSD.org</email>">
 
 <!ENTITY a.edwin "Edwin Groothuis <email>edwin@FreeBSD.org</email>">
 
 <!ENTITY a.eivind "Eivind Eklund <email>eivind@FreeBSD.org</email>">
 
 <!ENTITY a.ejc "Eric J. Chet <email>ejc@FreeBSD.org</email>">
 
+<!ENTITY a.emax "Maksim Yevmenkin <email>emax@FreeBSD.org</email>">
+
 <!ENTITY a.emoore "Eric Moore <email>emoore@FreeBSD.org</email>">
 
 <!ENTITY a.eric "Eric Melville <email>eric@FreeBSD.org</email>">
 
 <!ENTITY a.erich "Eric L. Hernes <email>erich@FreeBSD.org</email>">
 
 <!ENTITY a.erwin "Erwin Lansing <email>erwin@FreeBSD.org</email>">
 
 <!ENTITY a.fanf "Tony Finch <email>fanf@FreeBSD.org</email>">
 
 <!ENTITY a.fenner "Bill Fenner <email>fenner@FreeBSD.org</email>">
 
 <!ENTITY a.fjoe "Max Khon <email>fjoe@FreeBSD.org</email>">
 
 <!ENTITY a.flathill "Seiichirou Hiraoka <email>flathill@FreeBSD.org</email>">
 
 <!ENTITY a.foxfair "Howard F. Hu <email>foxfair@FreeBSD.org</email>">
 
 <!ENTITY a.fsmp "Steve Passe <email>fsmp@FreeBSD.org</email>">
 
 <!ENTITY a.furuta "Atsushi Furuta <email>furuta@FreeBSD.org</email>">
 
 <!ENTITY a.gad "Garance A Drosehn <email>gad@FreeBSD.org</email>">
 
 <!ENTITY a.gallatin "Andrew Gallatin <email>gallatin@FreeBSD.org</email>">
 
 <!ENTITY a.gerald "Gerald Pfeifer <email>gerald@FreeBSD.org</email>">
 
 <!ENTITY a.ghelmer "Guy Helmer <email>ghelmer@FreeBSD.org</email>">
 
 <!ENTITY a.gibbs "Justin T. Gibbs <email>gibbs@FreeBSD.org</email>">
 
 <!ENTITY a.gioria "Sebastien Gioria <email>gioria@FreeBSD.org</email>">
 
 <!ENTITY a.gj "Gary Jennejohn <email>gj@FreeBSD.org</email>">
 
 <!ENTITY a.glewis "Greg Lewis <email>glewis@FreeBSD.org</email>">
 
 <!ENTITY a.gordon "Gordon Tetlow <email>gordon@FreeBSD.org</email>">
 
 <!ENTITY a.gpalmer "Gary Palmer <email>gpalmer@FreeBSD.org</email>">
 
 <!ENTITY a.graichen "Thomas Graichen <email>graichen@FreeBSD.org</email>">
 
 <!ENTITY a.green "Brian F. Feldman <email>green@FreeBSD.org</email>">
 
 <!ENTITY a.grehan "Peter Grehan <email>grehan@FreeBSD.org</email>">
 
 <!ENTITY a.greid "George C. A. Reid <email>greid@FreeBSD.org</email>">
 
 <!ENTITY a.grog "Greg Lehey <email>grog@FreeBSD.org</email>">
 
 <!ENTITY a.groudier "Gerard Roudier <email>groudier@FreeBSD.org</email>">
 
 <!ENTITY a.gryphon "Coranth Gryphon <email>gryphon@FreeBSD.org</email>">
 
 <!ENTITY a.gshapiro "Gregory Neil Shapiro <email>gshapiro@FreeBSD.org</email>">
 
 <!ENTITY a.gsutter "Gregory Sutter <email>gsutter@FreeBSD.org</email>">
 
 <!ENTITY a.guido "Guido van Rooij <email>guido@FreeBSD.org</email>">
 
 <!ENTITY a.hanai "Hiroyuki HANAI <email>hanai@FreeBSD.org</email>">
 
 <!ENTITY a.harti "Hartmut Brandt <email>harti@FreeBSD.org</email>">
 
 <!ENTITY a.helbig "Wolfgang Helbig <email>helbig@FreeBSD.org</email>">
 
 <!ENTITY a.hm "Hellmuth Michaelis <email>hm@FreeBSD.org</email>">
 
 <!ENTITY a.hmp "Hiten Pandya <email>hmp@FreeBSD.org</email>">
 
 <!ENTITY a.hoek "Tim Vanderhoek <email>hoek@FreeBSD.org</email>">
 
 <!ENTITY a.horikawa "Kazuo Horikawa <email>horikawa@FreeBSD.org</email>">
 
 <!ENTITY a.hosokawa "Tatsumi Hosokawa <email>hosokawa@FreeBSD.org</email>">
 
 <!ENTITY a.hrs "Hiroki Sato <email>hrs@FreeBSD.org</email>">
 
 <!ENTITY a.hsu "Jeffrey Hsu <email>hsu@FreeBSD.org</email>">
 
 <!ENTITY a.iedowse "Ian Dowse <email>iedowse@FreeBSD.org</email>">
 
 <!ENTITY a.ijliao "Ying-Chieh Liao <email>ijliao@FreeBSD.org</email>">
 
 <!ENTITY a.ikob "Katsushi Kobayashi <email>ikob@FreeBSD.org</email>">
 
 <!ENTITY a.imp "Warner Losh <email>imp@FreeBSD.org</email>">
 
 <!ENTITY a.imura "R. Imura <email>imura@FreeBSD.org</email>">
 
 <!ENTITY a.issei "Issei Suzuki <email>issei@FreeBSD.org</email>">
 
 <!ENTITY a.itojun "Jun-ichiro Itoh <email>itojun@itojun.org</email>">
 
 <!ENTITY a.iwasaki "Mitsuru IWASAKI <email>iwasaki@FreeBSD.org</email>">
 
 <!ENTITY a.jake "Jake Burkholder <email>jake@FreeBSD.org</email>">
 
 <!ENTITY a.jasone "Jason Evans <email>jasone@FreeBSD.org</email>">
 
 <!ENTITY a.jayanth "Jayanth Vijayaraghavan <email>jayanth@FreeBSD.org</email>">
 
 <!ENTITY a.jb "John Birrell <email>jb@FreeBSD.org</email>">
 
 <!ENTITY a.jdp "John Polstra <email>jdp@FreeBSD.org</email>">
 
 <!ENTITY a.jedgar "Chris D. Faulhaber <email>jedgar@FreeBSD.org</email>">
 
 <!ENTITY a.jeff "Jeff Roberson <email>jeff@FreeBSD.org</email>">
 
 <!ENTITY a.jeh "James Housley <email>jeh@FreeBSD.org</email>">
 
 <!ENTITY a.jehamby "Jake Hamby <email>jehamby@FreeBSD.org</email>">
 
 <!ENTITY a.jennifer "Jennifer Yang <email>jennifer@FreeBSD.org</email>">
 
 <!ENTITY a.jesper "Jesper Skriver <email>jesper@FreeBSD.org</email>">
 
 <!ENTITY a.jesusr "Jesus Rodriguez <email>jesusr@FreeBSD.org</email>">
 
 <!ENTITY a.jfieber "John Fieber <email>jfieber@FreeBSD.org</email>">
 
 <!ENTITY a.jfitz "James FitzGibbon <email>jfitz@FreeBSD.org</email>">
 
 <!ENTITY a.jgreco "Joe Greco <email>jgreco@FreeBSD.org</email>">
 
 <!ENTITY a.jhay "John Hay <email>jhay@FreeBSD.org</email>">
 
 <!ENTITY a.jhb "John Baldwin <email>jhb@FreeBSD.org</email>">
 
 <!ENTITY a.jhs "Julian Stacey <email>jhs@FreeBSD.org</email>">
 
 <!ENTITY a.jim "Jim Mock <email>jim@FreeBSD.org</email>">
 
 <!ENTITY a.jkh "Jordan K. Hubbard <email>jkh@FreeBSD.org</email>">
 
 <!ENTITY a.jkoshy "Joseph Koshy <email>jkoshy@FreeBSD.org</email>">
 
 <!ENTITY a.jlemon "Jonathan Lemon <email>jlemon@FreeBSD.org</email>">
 
 <!ENTITY a.jlrobin "James L. Robinson <email>jlrobin@FreeBSD.org</email>">
 
 <!ENTITY a.jmacd "Joshua Peck Macdonald <email>jmacd@FreeBSD.org</email>">
 
 <!ENTITY a.jmallett "Juli Mallett <email>jmallett@FreeBSD.org</email>">
 
 <!ENTITY a.jmas "Jose M. Alcaide <email>jmas@FreeBSD.org</email>">
 
 <!ENTITY a.jmb "Jonathan M. Bresler <email>jmb@FreeBSD.org</email>">
 
 <!ENTITY a.jmg "John-Mark Gurney <email>jmg@FreeBSD.org</email>">
 
 <!ENTITY a.jmz "Jean-Marc Zucconi <email>jmz@FreeBSD.org</email>">
 
 <!ENTITY a.joe "Josef Karthauser <email>joe@FreeBSD.org</email>">
 
 <!ENTITY a.joerg "J&ouml;rg Wunsch <email>joerg@FreeBSD.org</email>">
 
 <!ENTITY a.johan "Johan Karlsson <email>johan@FreeBSD.org</email>">
 
 <!ENTITY a.john "John Cavanaugh <email>john@FreeBSD.org</email>">
 
 <!ENTITY a.jon "Jonathan Chen <email>jon@FreeBSD.org</email>">
 
 <!ENTITY a.jseger "Justin Seger <email>jseger@FreeBSD.org</email>">
 
 <!ENTITY a.julian "Julian Elischer <email>julian@FreeBSD.org</email>">
 
 <!ENTITY a.jvh "Johannes Helander <email>jvh@FreeBSD.org</email>">
 
 <!ENTITY a.jwd "John W. DeBoskey <email>jwd@FreeBSD.org</email>">
 
 <!ENTITY a.kan "Alexander Kabaev <email>kan@FreeBSD.org</email>">
 
 <!ENTITY a.karl "Karl Strickland <email>karl@FreeBSD.org</email>">
 
 <!ENTITY a.kato "Takenori KATO <email>kato@FreeBSD.org</email>">
 
 <!ENTITY a.kbyanc "Kelly Yancey <email>kbyanc@FreeBSD.org</email>">
 
 <!ENTITY a.keichii "Michael C. Wu <email>keichii@FreeBSD.org</email>">
 
 <!ENTITY a.keith "Jing-Tang Keith Jang <email>keith@FreeBSD.org</email>">
 
 <!ENTITY a.ken "Kenneth D. Merry <email>ken@FreeBSD.org</email>">
 
 <!ENTITY a.kensmith "Ken Smith <email>kensmith@FreeBSD.org</email>">
 
 <!ENTITY a.keramida "Giorgos Keramidas <email>keramida@FreeBSD.org</email>">
 
 <!ENTITY a.kevlo "Kevin Lo <email>kevlo@FreeBSD.org</email>">
 
 <!ENTITY a.kientzle "Tim Kientzle <email>kientzle@FreeBSD.org</email>">
 
 <!ENTITY a.kiri "Kazuhiko Kiriyama <email>kiri@FreeBSD.org</email>">
 
 <!ENTITY a.kjc "Kenjiro Cho <email>kjc@FreeBSD.org</email>">
 
 <!ENTITY a.knu "Akinori MUSHA <email>knu@FreeBSD.org</email>">
 
 <!ENTITY a.krion "Kirill Ponomarew <email>krion@FreeBSD.org</email>">
 
 <!ENTITY a.kris "Kris Kennaway <email>kris@FreeBSD.org</email>">
 
 <!ENTITY a.kuriyama "Jun Kuriyama <email>kuriyama@FreeBSD.org</email>">
 
 <!ENTITY a.lars "Lars Fredriksen <email>lars@FreeBSD.org</email>">
 
 <!ENTITY a.leeym "Yen-Ming Lee <email>leeym@FreeBSD.org</email>">
 
 <!ENTITY a.lev "Lev Serebryakov <email>lev@FreeBSD.org</email>">
 
 <!ENTITY a.lile "Larry Lile <email>lile@FreeBSD.org</email>">
 
 <!ENTITY a.lioux "M&aacute;rio S&eacute;rgio Fujikawa Ferreira <email>lioux@FreeBSD.org</email>">
 
 <!ENTITY a.ljo "L Jonas Olsson <email>ljo@FreeBSD.org</email>">
 
 <!ENTITY a.lkoeller "Lars Koeller <email>lkoeller@FreeBSD.org</email>">
 
 <!ENTITY a.lofi "Michael Nottebrock <email>lofi@FreeBSD.org</email>">
 
 <!ENTITY a.logo "Valentino Vaschetto <email>logo@FreeBSD.org</email>">
 
 <!ENTITY a.luigi "Luigi Rizzo <email>luigi@FreeBSD.org</email>">
 
 <!ENTITY a.luoqi "Luoqi Chen <email>luoqi@FreeBSD.org</email>">
 
 <!ENTITY a.maho "Maho Nakata <email>maho@FreeBSD.org</email>">
 
 <!ENTITY a.marcel "Marcel Moolenaar <email>marcel@FreeBSD.org</email>">
 
 <!ENTITY a.marcus "Joe Marcus Clarke <email>marcus@FreeBSD.org</email>">
 
 <!ENTITY a.markm "Mark Murray <email>markm@FreeBSD.org</email>">
 
 <!ENTITY a.marko "Mark Ovens <email>marko@FreeBSD.org</email>">
 
 <!ENTITY a.markp "Mark Pulford <email>markp@FreeBSD.org</email>">
 
 <!ENTITY a.martin "Martin Renters <email>martin@FreeBSD.org</email>">
 
 <!ENTITY a.mat "Mathieu Arnold <email>mat@FreeBSD.org</email>">
 
 <!ENTITY a.matusita "Makoto Matsushita <email>matusita@FreeBSD.org</email>">
 
 <!ENTITY a.max "Masafumi NAKANE <email>max@FreeBSD.org</email>">
 
 <!ENTITY a.maxim "Maxim Konovalov <email>maxim@FreeBSD.org</email>">
 
 <!ENTITY a.mb "Maxim Bolotin <email>mb@FreeBSD.org</email>">
 
 <!ENTITY a.mbarkah "Ade Barkah <email>mbarkah@FreeBSD.org</email>">
 
 <!ENTITY a.mbr "Martin Blapp <email>mbr@FreeBSD.org</email>">
 
 <!ENTITY a.mckay "Stephen McKay <email>mckay@FreeBSD.org</email>">
 
 <!ENTITY a.mckusick "Kirk McKusick <email>mckusick@FreeBSD.org</email>">
 
 <!ENTITY a.mdodd "Matthew N. Dodd <email>mdodd@FreeBSD.org</email>">
 
 <!ENTITY a.mharo "Michael Haro <email>mharo@FreeBSD.org</email>">
 
 <!ENTITY a.mheinen "Martin Heinen <email>mheinen@FreeBSD.org</email>">
 
 <!ENTITY a.mi "Mikhail Teterin <email>mi@FreeBSD.org</email>">
 
 <!ENTITY a.mich "Michael L. Hostbaek <email>mich@FreeBSD.org</email>">
 
 <!ENTITY a.mike "Mike Barcroft <email>mike@FreeBSD.org</email>">
 
 <!ENTITY a.mikeh "Mike Heffner <email>mikeh@FreeBSD.org</email>">
 
 <!ENTITY a.mini "Jonathan Mini <email>mini@FreeBSD.org</email>">
 
 <!ENTITY a.mita "Yoshio MITA <email>mita@FreeBSD.org</email>">
 
 <!ENTITY a.mjacob "Matthew Jacob <email>mjacob@FreeBSD.org</email>">
 
 <!ENTITY a.mks "Mike Spengler <email>mks@FreeBSD.org</email>">
 
 <!ENTITY a.motoyuki "Motoyuki Konno <email>motoyuki@FreeBSD.org</email>">
 
 <!ENTITY a.mp "Mark Peek <email>mp@FreeBSD.org</email>">
 
 <!ENTITY a.mph "Matthew Hunt <email>mph@FreeBSD.org</email>">
 
 <!ENTITY a.mpp "Mike Pritchard <email>mpp@FreeBSD.org</email>">
 
 <!ENTITY a.mr "Michael Reifenberger <email>mr@FreeBSD.org</email>">
 
 <!ENTITY a.msmith "Michael Smith <email>msmith@FreeBSD.org</email>">
 
 <!ENTITY a.mtaylor "Mark J. Taylor <email>mtaylor@FreeBSD.org</email>">
 
 <!ENTITY a.mtm "Mike Makonnen <email>mtm@FreeBSD.org</email>">
 
 <!ENTITY a.murray "Murray Stokely <email>murray@FreeBSD.org</email>">
 
 <!ENTITY a.mux "Maxime Henrion <email>mux@FreeBSD.org</email>">
 
 <!ENTITY a.mwlucas "Michael W. Lucas <email>mwlucas@FreeBSD.org</email>">
 
 <!ENTITY a.naddy "Christian Weisgerber <email>naddy@FreeBSD.org</email>">
 
 <!ENTITY a.nakai "Yukihiro Nakai <email>nakai@FreeBSD.org</email>">
 
 <!ENTITY a.nate "Nate Williams <email>nate@FreeBSD.org</email>">
 
 <!ENTITY a.nbm "Neil Blakey-Milner <email>nbm@FreeBSD.org</email>">
 
 <!ENTITY a.nectar "Jacques Vidrine <email>nectar@FreeBSD.org</email>">
 
 <!ENTITY a.netchild "Alexander Leidinger <email>netchild@FreeBSD.org</email>">
 
 <!ENTITY a.newton "Mark Newton <email>newton@FreeBSD.org</email>">
 
 <!ENTITY a.nhibma "Nick Hibma <email>n_hibma@FreeBSD.org</email>">
 
 <!ENTITY a.nik "Nik Clayton <email>nik@FreeBSD.org</email>">
 
 <!ENTITY a.njl "Nate Lawson <email>njl@FreeBSD.org</email>">
 
 <!ENTITY a.nobutaka "Nobutaka MANTANI <email>nobutaka@FreeBSD.org</email>">
 
 <!ENTITY a.non "Noriaki Mitsunaga <email>non@FreeBSD.org</email>">
 
 <!ENTITY a.nork "Norikatsu Shigemura <email>nork@FreeBSD.org</email>">
 
 <!ENTITY a.nsayer "Nick Sayer <email>nsayer@FreeBSD.org</email>">
 
 <!ENTITY a.nsouch "Nicolas Souchu <email>nsouch@FreeBSD.org</email>">
 
 <!ENTITY a.nyan "Yoshihiro Takahashi <email>nyan@FreeBSD.org</email>">
 
 <!ENTITY a.obraun "Oliver Braun <email>obraun@FreeBSD.org</email>">
 
 <!ENTITY a.obrien "David O'Brien <email>obrien@FreeBSD.org</email>">
 
 <!ENTITY a.okazaki "Tetsurou OKAZAKI <email>okazaki@FreeBSD.org</email>">
 
 <!ENTITY a.olgeni "Jimmy Olgeni <email>olgeni@FreeBSD.org</email>">
 
 <!ENTITY a.oliver "Oliver Lehmann <email>oliver@FreeBSD.org</email>">
 
 <!ENTITY a.onoe "Atsushi Onoe <email>onoe@FreeBSD.org</email>">
 
 <!ENTITY a.orion "Orion Hodson <email>orion@FreeBSD.org</email>">
 
 <!ENTITY a.osa "Sergey A. Osokin <email>osa@FreeBSD.org</email>">
 
 <!ENTITY a.pat "Patrick Li <email>pat@FreeBSD.org</email>">
 
 <!ENTITY a.patrick "Patrick S. Gardella <email>patrick@FreeBSD.org</email>">
 
 <!ENTITY a.paul "Paul Richards <email>paul@FreeBSD.org</email>">
 
 <!ENTITY a.pb "Pierre Beyssac <email>pb@FreeBSD.org</email>">
 
 <!ENTITY a.pdeuskar "Prafulla S. Deuskar <email>pdeuskar@FreeBSD.org</email>">
 
 <!ENTITY a.pds "Peter da Silva <email>pds@FreeBSD.org</email>">
 
 <!ENTITY a.perky "Hye-Shik Chang <email>perky@FreeBSD.org</email>">
 
 <!ENTITY a.petef "Pete Fritchman <email>petef@FreeBSD.org</email>">
 
 <!ENTITY a.peter "Peter Wemm <email>peter@FreeBSD.org</email>">
 
 <!ENTITY a.phantom "Alexey Zelkin <email>phantom@FreeBSD.org</email>">
 
 <!ENTITY a.phk "Poul-Henning Kamp <email>phk@FreeBSD.org</email>">
 
 <!ENTITY a.pho "Peter Holm <email>pho@FreeBSD.org</email>">
 
 <!ENTITY a.piero "Piero Serini <email>piero@FreeBSD.org</email>">
 
 <!ENTITY a.pirzyk "Jim Pirzyk <email>pirzyk@FreeBSD.org</email>">
 
 <!ENTITY a.proven "Chris Provenzano <email>proven@FreeBSD.org</email>">
 
 <!ENTITY a.ps "Paul Saab <email>ps@FreeBSD.org</email>">
 
 <!ENTITY a.pst "Paul Traina <email>pst@FreeBSD.org</email>">
 
 <!ENTITY a.reg "Jeremy Lea <email>reg@FreeBSD.org</email>">
 
 <!ENTITY a.rgrimes "Rodney Grimes <email>rgrimes@FreeBSD.org</email>">
 
 <!ENTITY a.ricardag "Ricardo AG <email>ricardag@FreeBSD.org</email>">
 
 <!ENTITY a.rich "Rich Murphey <email>rich@FreeBSD.org</email>">
 
 <!ENTITY a.rnordier "Robert Nordier <email>rnordier@FreeBSD.org</email>">
 
 <!ENTITY a.roam "Peter Pentchev <email>roam@FreeBSD.org</email>">
 
 <!ENTITY a.robert "Robert Drehmel <email>robert@FreeBSD.org</email>">
 
 <!ENTITY a.roberto "Ollivier Robert <email>roberto@FreeBSD.org</email>">
 
 <!ENTITY a.roger "Roger Hardiman <email>roger@FreeBSD.org</email>">
 
 <!ENTITY a.rpratt "Randy Pratt <email>rpratt@FreeBSD.org</email>">
 
 <!ENTITY a.rse "Ralf S. Engelschall <email>rse@FreeBSD.org</email>">
 
 <!ENTITY a.ru "Ruslan Ermilov <email>ru@FreeBSD.org</email>">
 
 <!ENTITY a.rushani "Hideyuki KURASHINA <email>rushani@FreeBSD.org</email>">
 
 <!ENTITY a.rv "Rajesh Vaidheeswarran <email>rv@FreeBSD.org</email>">
 
 <!ENTITY a.rvb "Robert V. Baron <email>rvb@FreeBSD.org</email>">
 
 <!ENTITY a.rwatson "Robert Watson <email>rwatson@FreeBSD.org</email>">
 
 <!ENTITY a.sada "SADA Kenji <email>sada@FreeBSD.org</email>">
 
 <!ENTITY a.sam "Sam Leffler <email>sam@FreeBSD.org</email>">
 
 <!ENTITY a.sanpei "Yoshiro Sanpei MIHIRA <email>sanpei@FreeBSD.org</email>">
 
 <!ENTITY a.schweikh "Jens Schweikhardt <email>schweikh@FreeBSD.org</email>">
 
 <!ENTITY a.scop "Ville Skytt&auml; <email>scop@FreeBSD.org</email>">
 
 <!ENTITY a.scottl "Scott Long <email>scottl@FreeBSD.org</email>">
 
 <!ENTITY a.scrappy "Marc G. Fournier <email>scrappy@FreeBSD.org</email>">
 
 <!ENTITY a.se "Stefan Esser <email>se@FreeBSD.org</email>">
 
 <!ENTITY a.seanc "Sean Chittenden <email>seanc@FreeBSD.org</email>">
 
 <!ENTITY a.sef "Sean Eric Fagan <email>sef@FreeBSD.org</email>">
 
 <!ENTITY a.semenu "Semen Ustimenko <email>semenu@FreeBSD.org</email>">
 
 <!ENTITY a.sf "Satsuki FUJISHIMA <email>sf@FreeBSD.org</email>">
 
 <!ENTITY a.shafeeq "Shafeeq Sinnamohideen <email>shafeeq@FreeBSD.org</email>">
 
 <!ENTITY a.sheldonh "Sheldon Hearn <email>sheldonh@FreeBSD.org</email>">
 
 <!ENTITY a.shiba "Takeshi Shibagaki <email>shiba@FreeBSD.org</email>">
 
 <!ENTITY a.shige "Shigeyuki Fukushima <email>shige@FreeBSD.org</email>">
 
 <!ENTITY a.shin "Yoshinobu Inoue <email>shin@FreeBSD.org</email>">
 
 <!ENTITY a.silby "Mike Silbersack <email>silby@FreeBSD.org</email>">
 
 <!ENTITY a.simokawa "Hidetoshi Shimokawa <email>simokawa@FreeBSD.org</email>">
 
 <!ENTITY a.simon "Simon L. Nielsen <email>simon@FreeBSD.org</email>">
 
 <!ENTITY a.skv "Sergey Skvortsov <email>skv@FreeBSD.org</email>">
 
 <!ENTITY a.smace "Scott Mace <email>smace@FreeBSD.org</email>">
 
 <!ENTITY a.smkelly "Sean Kelly <email>smkelly@FreeBSD.org</email>">
 
 <!ENTITY a.smpatel "Sujal Patel <email>smpatel@FreeBSD.org</email>">
 
 <!ENTITY a.sobomax "Maxim Sobolev <email>sobomax@FreeBSD.org</email>">
 
 <!ENTITY a.sos "S&oslash;ren Schmidt <email>sos@FreeBSD.org</email>">
 
 <!ENTITY a.stanislav "G. Adam Stanislav <email>adam@redprince.net</email>">
 
 <!ENTITY a.stark "Gene Stark <email>stark@FreeBSD.org</email>">
 
 <!ENTITY a.stb "Stefan Bethke <email>stb@FreeBSD.org</email>">
 
 <!ENTITY a.stephane "St&eacute;phane Legrand <email>stephane@FreeBSD.org</email>">
 
 <!ENTITY a.steve "Steve Price <email>steve@FreeBSD.org</email>">
 
 <!ENTITY a.sumikawa "Munechika Sumikawa <email>sumikawa@FreeBSD.org</email>">
 
 <!ENTITY a.suz "SUZUKI Shinsuke <email>suz@FreeBSD.org</email>">
 
 <!ENTITY a.swallace "Steven Wallace <email>swallace@FreeBSD.org</email>">
 
 <!ENTITY a.takawata "Takanori Watanabe <email>takawata@FreeBSD.org</email>">
 
 <!ENTITY a.tanimura "Seigo Tanimura <email>tanimura@FreeBSD.org</email>">
 
 <!ENTITY a.taoka "Satoshi Taoka <email>taoka@FreeBSD.org</email>">
 
 <!ENTITY a.tedm "Ted Mittelstaedt <email>tedm@FreeBSD.org</email>">
 
 <!ENTITY a.tegge "Tor Egge <email>tegge@FreeBSD.org</email>">
 
 <!ENTITY a.tg "Thomas Gellekum <email>tg@FreeBSD.org</email>">
 
 <!ENTITY a.thepish "Peter Hawkins <email>thepish@FreeBSD.org</email>">
 
 <!ENTITY a.thomas "Thomas Quinot <email>thomas@FreeBSD.org</email>">
 
 <!ENTITY a.ticso "Bernd Walter <email>ticso@FreeBSD.org</email>">
 
 <!ENTITY a.tjr "Tim J. Robbins <email>tjr@FreeBSD.org</email>">
 
 <!ENTITY a.tmm "Thomas M&ouml;stl <email>tmm@FreeBSD.org</email>">
 
 <!ENTITY a.tobez "Anton Berezin <email>tobez@FreeBSD.org</email>">
 
 <!ENTITY a.tom "Tom Hukins <email>tom@FreeBSD.org</email>">
 
 <!ENTITY a.tomsoft "Thomas-Henning von Kamptz <email>tomsoft@FreeBSD.org</email>">
 
 <!ENTITY a.torstenb "Torsten Blum <email>torstenb@FreeBSD.org</email>">
 
 <!ENTITY a.toshi "Toshihiko Arai <email>toshi@FreeBSD.org</email>">
 
 <!ENTITY a.trevor "Trevor Johnson <email>trevor@FreeBSD.org</email>">
 
 <!ENTITY a.trhodes "Tom Rhodes <email>trhodes@FreeBSD.org</email>">
 
 <!ENTITY a.truckman "Don &ldquo;Truck&rdquo; Lewis <email>truckman@FreeBSD.org</email>">
 
 <!ENTITY a.tshiozak "Takuya SHIOZAKI <email>tshiozak@FreeBSD.org</email>">
 
 <!ENTITY a.uch "Yasushi UCHIYAMA <email>uch@FreeBSD.org</email>">
 
 <!ENTITY a.ue "Udo Erdelhoff <email>ue@FreeBSD.org</email>">
 
 <!ENTITY a.ugen "Ugen J.S.Antsilevich <email>ugen@FreeBSD.org</email>">
 
 <!ENTITY a.uhclem "Frank Durda IV <email>uhclem@FreeBSD.org</email>">
 
 <!ENTITY a.ulf "Ulf Zimmermann <email>ulf@FreeBSD.org</email>">
 
 <!ENTITY a.ume "Hajimu UMEMOTO <email>ume@FreeBSD.org</email>">
 
 <!ENTITY a.unfurl "Bill Swingle <email>unfurl@FreeBSD.org</email>">
 
 <!ENTITY a.vanilla "Vanilla I. Shu <email>vanilla@FreeBSD.org</email>">
 
 <!ENTITY a.wes "Wes Peters <email>wes@FreeBSD.org</email>">
 
 <!ENTITY a.whiteside "Don Whiteside <email>whiteside@acm.org</email>">
 
 <!ENTITY a.wilko "Wilko Bulte <email>wilko@FreeBSD.org</email>">
 
 <!ENTITY a.will "Will Andrews <email>will@FreeBSD.org</email>">
 
 <!ENTITY a.wjv "Johann Visagie <email>wjv@FreeBSD.org</email>">
 
 <!ENTITY a.wollman "Garrett Wollman <email>wollman@FreeBSD.org</email>">
 
 <!ENTITY a.wosch "Wolfram Schneider <email>wosch@FreeBSD.org</email>">
 
 <!ENTITY a.wpaul "Bill Paul <email>wpaul@FreeBSD.org</email>">
 
 <!ENTITY a.wsanchez "Wilfredo S&aacute;nchez <email>wsanchez@FreeBSD.org</email>">
 
 <!ENTITY a.wylie "Wylie Stilwell <email>wylie@magnesium.net</email>">
 
 <!ENTITY a.yar "Yar Tikhiy <email>yar@FreeBSD.org</email>">
 
 <!ENTITY a.yoichi "Yoichi NAKAYAMA <email>yoichi@FreeBSD.org</email>">
 
 <!ENTITY a.yokota "Kazutaka YOKOTA <email>yokota@FreeBSD.org</email>">
 
 <!ENTITY a.zarzycki "Dave Zarzycki <email>zarzycki@FreeBSD.org</email>">
 
 <!ENTITY a.znerd "Ernst de Haan <email>znerd@FreeBSD.org</email>">
 
diff --git a/share/pgpkeys/emax.key b/share/pgpkeys/emax.key
new file mode 100644
index 0000000000..4f9003c0a4
--- /dev/null
+++ b/share/pgpkeys/emax.key
@@ -0,0 +1,31 @@
+<!-- $FreeBSD$ -->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub  1024D/F050D2DD 2003-10-01 Maksim Yevmenkin <m_evmenkin@yahoo.com>
+     Key fingerprint = 8F3F D359 E318 5641 8C81  34AD 791D 53F5 F050 D2DD
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.2 (FreeBSD)
+
+mQGiBD97XL8RBACC3CMLdwZY/RcLw4PM6h2KYj+cG7TNSfNWszZO5HdQYrd6HZKQ
+h0cL7cyW1Low8a2ZulxtEjM1SfofzDlhNaTYhyjlO4xBnJM13dMFchmM4j4qF0Mu
+al1MEeO3EbLntFsh/aDX2sOKEavz5id8eKmAZKez2O5Z27bymkFf4o2UbwCg841B
+WuuWHsy4O1zrac0WidkS3G0D/jeVbYA09gylZA1KSd3djHE55lQDQrUt3+2xWxjG
+Lg60WIqys/yxei6nVO7/Wr6Q1WISiX0bYXAxHCZZQrT6cuNtEBntPPa9PnXRewUx
+8xwVCBIuSLK5Kw2WZ2FMuQWTzfd4fwt8P9vghJlaV3h5Byw3e6/MdoDID9Jkg/ml
+f5FuA/9kZBwtE4zKJvx3Pv7EG6T0w82QA0SFtcFyRnNarUIfqyUsFXNkr8hoQT3Z
+J5haO/lW2HW70KMr26GxK61XcF8LQtfvphv9M+4yF3+DZSu1YxUM1Vs/q27EQhXa
+3Cs4kJkKdzW2xDbIbuD5ZJQqFAzWX7IiTTNXnEGZStPTQMYZLbQnTWFrc2ltIFll
+dm1lbmtpbiA8bV9ldm1lbmtpbkB5YWhvby5jb20+iFsEExECABsFAj97XL8GCwkI
+BwMCAxUCAwMWAgECHgECF4AACgkQeR1T9fBQ0t01FQCfUR367fJJ37Wl4HvZVBoF
+peBX9ZEAniaaK/D+n/JttkgY8jJf2ZvjF0SSuQENBD97XMIQBACPpJjDdDw42++u
+vPMW/R7Iwqdpgs22T/bzVlFxDGx2uD9xaoNKI03jkOyUWiFlHbuifMRhxTwO5Vyg
+nj91Y0fk8hdd9bjT0ee7lJuQ8PBqzb/uEVGFIC+56/ocFzuBANdN5fzEfxp5AA0o
+zAPotyGEmLLK8+3ApZmAbsnQEveOwwADBQP+KgIxPzWAxYSn/MFPK2QBEjHuCCsS
+JB+VOShc/QaSn/wFEKc8Brjpr1KeAEi7dFrK4Sa2Rn2+k9tRSJptxi1m3Hrr0J2z
+0JofnF6cKkvmIsCse5OGCK/LJmuWHuNVqYI2X9Q0am+soHEYsRaqB/BDLT5Mw0mE
+5NO6455cKEcyizmIRgQYEQIABgUCP3tcwgAKCRB5HVP18FDS3b1HAJ9ZjWomBkE4
+1vaMSXyIopmSQNVxSQCg3J+fBmk0yhD2A8CIfxhpSRJDwus=
+=wV5Z
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>