diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
index bcd75f943d..4453727ad8 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
@@ -1,786 +1,791 @@
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
 <!--
 
   Do not edit this file except as instructed by the addkey.sh script.
 
   See the README file in doc/share/pgpkeys for instructions.
 
 -->
 <appendix id="pgpkeys">
   <title>PGP Keys</title>
 
   <indexterm><primary>pgp keys</primary></indexterm>
   <para>In case you need to verify a signature or send encrypted email
     to one of the officers or developers a number of keys are provided
     here for your convenience.  A complete keyring of FreeBSD.org
     users is available for download from <ulink url="../../../../doc/pgpkeyring.txt">http://www.FreeBSD.org/doc/pgpkeyring.txt</ulink>.</para>
 
   <sect1 id="pgpkeys-officers">
     <title>Officers</title>
 
     <sect2 id="pgpkey-security-officer">
       <title>&a.security-officer;</title>
       &pgpkey.security-officer;
     </sect2>
 
     <sect2 id="pgpkey-core-secretary">
       <title>&a.core-secretary;</title>
       &pgpkey.core-secretary;
     </sect2>
 
   </sect1>
 
   <sect1 id="pgpkeys-core">
     <title>Core Team Members</title>
 
     <sect2 id="pgpkey-imp">
       <title>&a.imp;</title>
       &pgpkey.imp;
     </sect2>
 
     <sect2 id="pgpkey-jhb">
       <title>&a.jhb;</title>
       &pgpkey.jhb;
     </sect2>
 
     <sect2 id="pgpkey-kuriyama">
       <title>&a.kuriyama;</title>
       &pgpkey.kuriyama;
     </sect2>
 
     <sect2 id="pgpkey-murray">
       <title>&a.murray;</title>
       &pgpkey.murray;
     </sect2>
 
     <sect2 id="pgpkey-peter">
       <title>&a.peter;</title>
       &pgpkey.peter;
     </sect2>
 
     <sect2 id="pgpkey-wes">
       <title>&a.wes;</title>
       &pgpkey.wes;
     </sect2>
   </sect1>
 
   <sect1 id="pgpkeys-developers">
     <title>Developers</title>
 
     <sect2 id="pgpkey-will">
       <title>&a.will;</title>
       &pgpkey.will;
     </sect2>
 
     <sect2 id="pgpkey-mat">
       <title>&a.mat;</title>
       &pgpkey.mat;
     </sect2>
 
     <sect2 id="pgpkey-asami">
       <title>&a.asami;</title>
       &pgpkey.asami;
     </sect2>
 
     <sect2 id="pgpkey-dougb">
       <title>&a.dougb;</title>
       &pgpkey.dougb;
     </sect2>
 
     <sect2 id="pgpkey-tobez">
       <title>&a.tobez;</title>
       &pgpkey.tobez;
     </sect2>
 
     <sect2 id="pgpkey-mbr">
       <title>&a.mbr;</title>
       &pgpkey.mbr;
     </sect2>
 
     <sect2 id="pgpkey-hart">
       <title>&a.harti;</title>
       &pgpkey.harti;
     </sect2>
 
     <sect2 id="pgpkey-obraun">
       <title>&a.obraun;</title>
       &pgpkey.obraun;
     </sect2>
 
     <sect2 id="pgpkey-jmb">
       <title>&a.jmb;</title>
       &pgpkey.jmb;
     </sect2>
 
     <sect2 id="pgpkey-brueffer">
       <title>&a.brueffer;</title>
       &pgpkey.brueffer;
     </sect2>
 
     <sect2 id="pgpkey-markus">
       <title>&a.markus;</title>
       &pgpkey.markus;
     </sect2>
 
     <sect2 id="pgpkey-wilko">
       <title>&a.wilko;</title>
       &pgpkey.wilko;
     </sect2>
 
     <sect2 id="pgpkey-jon">
       <title>&a.jon;</title>
       &pgpkey.jon;
     </sect2>
 
     <sect2 id="pgpkey-luoqi">
       <title>&a.luoqi;</title>
       &pgpkey.luoqi;
     </sect2>
 
     <sect2 id="pgpkey-ache">
       <title>&a.ache;</title>
       &pgpkey.ache;
     </sect2>
 
     <sect2 id="pgpkey-seanc">
       <title>&a.seanc;</title>
       &pgpkey.seanc;
     </sect2>
 
     <sect2 id="pgpkey-cjh">
       <title>&a.cjh;</title>
       &pgpkey.cjh;
     </sect2>
 
     <sect2 id="pgpkey-cjc">
       <title>&a.cjc;</title>
       &pgpkey.cjc;
     </sect2>
 
     <sect2 id="pgpkey-marcus">
       <title>&a.marcus;</title>
       &pgpkey.marcus;
     </sect2>
 
     <sect2 id="pgpkey-nik">
       <title>&a.nik;</title>
       &pgpkey.nik;
     </sect2>
 
     <sect2 id="pgpkey-ceri">
       <title>&a.ceri;</title>
       &pgpkey.ceri;
     </sect2>
 
     <sect2 id="pgpkey-brooks">
       <title>&a.brooks;</title>
       &pgpkey.brooks;
     </sect2>
 
     <sect2 id="pgpkey-pjd">
       <title>&a.pjd;</title>
       &pgpkey.pjd;
     </sect2>
 
     <sect2 id="pgpkey-bsd">
       <title>&a.bsd;</title>
       &pgpkey.bsd;
     </sect2>
 
     <sect2 id="pgpkey-dd">
       <title>&a.dd;</title>
       &pgpkey.dd;
     </sect2>
 
     <sect2 id="pgpkey-ale">
       <title>&a.ale;</title>
       &pgpkey.ale;
     </sect2>
 
     <sect2 id="pgpkey-peadar">
       <title>&a.peadar;</title>
       &pgpkey.peadar;
     </sect2>
 
     <sect2 id="pgpkey-josef">
       <title>&a.josef;</title>
       &pgpkey.josef;
     </sect2>
 
     <sect2 id="pgpkey-ue">
       <title>&a.ue;</title>
       &pgpkey.ue;
     </sect2>
 
     <sect2 id="pgpkey-ru">
       <title>&a.ru;</title>
       &pgpkey.ru;
     </sect2>
 
     <sect2 id="pgpkey-le">
       <title>&a.le;</title>
       &pgpkey.le;
     </sect2>
 
     <sect2 id="pgpkey-jedgar">
       <title>&a.jedgar;</title>
       &pgpkey.jedgar;
     </sect2>
 
     <sect2 id="pgpkey-green">
       <title>&a.green;</title>
       &pgpkey.green;
     </sect2>
 
     <sect2 id="pgpkey-lioux">
       <title>&a.lioux;</title>
       &pgpkey.lioux;
     </sect2>
 
     <sect2 id="pgpkey-fanf">
       <title>&a.fanf;</title>
       &pgpkey.fanf;
     </sect2>
 
     <sect2 id="pgpkey-blackend">
       <title>&a.blackend;</title>
       &pgpkey.blackend;
     </sect2>
 
     <sect2 id="pgpkey-petef">
       <title>&a.petef;</title>
       &pgpkey.petef;
     </sect2>
 
     <sect2 id="pgpkey-billf">
       <title>&a.billf;</title>
       &pgpkey.billf;
     </sect2>
 
     <sect2 id="pgpkey-patrick">
       <title>&a.patrick;</title>
       &pgpkey.patrick;
     </sect2>
 
     <sect2 id="pgpkey-gioria">
       <title>&a.gioria;</title>
       &pgpkey.gioria;
     </sect2>
 
     <sect2 id="pgpkey-jmg">
       <title>&a.jmg;</title>
       &pgpkey.jmg;
     </sect2>
 
     <sect2 id="pgpkey-dannyboy">
       <title>&a.dannyboy;</title>
       &pgpkey.dannyboy;
     </sect2>
 
     <sect2 id="pgpkey-jhay">
       <title>&a.jhay;</title>
       &pgpkey.jhay;
     </sect2>
 
     <sect2 id="pgpkey-sheldonh">
       <title>&a.sheldonh;</title>
       &pgpkey.sheldonh;
     </sect2>
 
     <sect2 id="pgpkey-mikeh">
       <title>&a.mikeh;</title>
       &pgpkey.mikeh;
     </sect2>
 
     <sect2 id="pgpkey-ghelmer">
       <title>&a.ghelmer;</title>
       &pgpkey.ghelmer;
     </sect2>
 
     <sect2 id="pgpkey-mux">
       <title>&a.mux;</title>
       &pgpkey.mux;
     </sect2>
 
     <sect2 id="pgpkey-mich">
       <title>&a.mich;</title>
       &pgpkey.mich;
     </sect2>
 
     <sect2 id="pgpkey-foxfair">
       <title>&a.foxfair;</title>
       &pgpkey.foxfair;
     </sect2>
 
     <sect2 id="pgpkey-jkh">
       <title>&a.jkh;</title>
       &pgpkey.jkh;
     </sect2>
 
     <sect2 id="pgpkey-trevor">
       <title>&a.trevor;</title>
       &pgpkey.trevor;
     </sect2>
 
     <sect2 id="pgpkey-phk">
       <title>&a.phk;</title>
       &pgpkey.phk;
     </sect2>
 
     <sect2 id="pgpkey-joe">
       <title>&a.joe;</title>
       &pgpkey.joe;
     </sect2>
 
     <sect2 id="pgpkey-vkashyap">
       <title>&a.vkashyap;</title>
       &pgpkey.vkashyap;
     </sect2>
 
     <sect2 id="pgpkey-kris">
       <title>&a.kris;</title>
       &pgpkey.kris;
     </sect2>
 
     <sect2 id="pgpkey-keramida">
       <title>&a.keramida;</title>
       &pgpkey.keramida;
     </sect2>
 
     <sect2 id="pgpkey-fjoe">
       <title>&a.fjoe;</title>
       &pgpkey.fjoe;
     </sect2>
 
     <sect2 id="pgpkey-andreas">
       <title>&a.andreas;</title>
       &pgpkey.andreas;
     </sect2>
 
     <sect2 id="pgpkey-sergei">
       <title>&a.sergei;</title>
       &pgpkey.sergei;
     </sect2>
 
     <sect2 id="pgpkey-maxim">
        <title>&a.maxim;</title>
        &pgpkey.maxim;
     </sect2>
 
     <sect2 id="pgpkey-jkoshy">
       <title>&a.jkoshy;</title>
       &pgpkey.jkoshy;
     </sect2>
 
     <sect2 id="pgpkey-rik">
       <title>&a.rik;</title>
       &pgpkey.rik;
     </sect2>
 
     <sect2 id="pgpkey-rushani">
       <title>&a.rushani;</title>
       &pgpkey.rushani;
     </sect2>
 
     <sect2 id="pgpkey-clement">
       <title>&a.clement;</title>
       &pgpkey.clement;
     </sect2>
 
     <sect2 id="pgpkey-mlaier">
       <title>&a.mlaier;</title>
       &pgpkey.mlaier;
     </sect2>
 
     <sect2 id="pgpkey-alex">
       <title>&a.alex;</title>
       &pgpkey.alex;
     </sect2>
 
     <sect2 id="pgpkey-erwin">
       <title>&a.erwin;</title>
       &pgpkey.erwin;
     </sect2>
 
     <sect2 id="pgpkey-leeym">
       <title>&a.leeym;</title>
       &pgpkey.leeym;
     </sect2>
 
     <sect2 id="pgpkey-netchild">
       <title>&a.netchild;</title>
       &pgpkey.netchild;
     </sect2>
 
     <sect2 id="pgpkey-ijliao">
       <title>&a.ijliao;</title>
       &pgpkey.ijliao;
     </sect2>
 
     <sect2 id="pgpkey-clive">
       <title>&a.clive;</title>
       &pgpkey.clive;
     </sect2>
 
     <sect2 id="pgpkey-arved">
       <title>&a.arved;</title>
       &pgpkey.arved;
     </sect2>
 
     <sect2 id="pgpkey-scottl">
       <title>&a.scottl;</title>
       &pgpkey.scottl;
     </sect2>
 
     <sect2 id="pgpkey-pav">
       <title>&a.pav;</title>
       &pgpkey.pav;
     </sect2>
 
     <sect2 id="pgpkey-bmah">
       <title>&a.bmah;</title>
       &pgpkey.bmah;
     </sect2>
 
     <sect2 id="pgpkey-mtm">
       <title>&a.mtm;</title>
       &pgpkey.mtm;
     </sect2>
 
     <sect2 id="pgpkey-dwmalone">
       <title>&a.dwmalone;</title>
       &pgpkey.dwmalone;
     </sect2>
 
     <sect2 id="pgpkey-matusita">
       <title>&a.matusita;</title>
       &pgpkey.matusita;
     </sect2>
 
     <sect2 id="pgpkey-ken">
       <title>&a.ken;</title>
       &pgpkey.ken;
     </sect2>
 
     <sect2 id="pgpkey-dinoex">
       <title>&a.dinoex;</title>
       &pgpkey.dinoex;
     </sect2>
 
     <sect2 id="pgpkey-sanpei">
       <title>&a.sanpei;</title>
       &pgpkey.sanpei;
     </sect2>
 
     <sect2 id="pgpkey-jim">
       <title>&a.jim;</title>
       &pgpkey.jim;
     </sect2>
 
     <sect2 id="pgpkey-marcel">
       <title>&a.marcel;</title>
       &pgpkey.marcel;
     </sect2>
 
     <sect2 id="pgpkey-tmm">
       <title>&a.tmm;</title>
       &pgpkey.tmm;
     </sect2>
 
     <sect2 id="pgpkey-rich">
       <title>&a.rich;</title>
       &pgpkey.rich;
     </sect2>
 
     <sect2 id="pgpkey-knu">
       <title>&a.knu;</title>
       &pgpkey.knu;
     </sect2>
 
     <sect2 id="pgpkey-max">
       <title>&a.max;</title>
       &pgpkey.max;
     </sect2>
 
     <sect2 id="pgpkey-yoichi">
       <title>&a.yoichi;</title>
       &pgpkey.yoichi;
     </sect2>
 
     <sect2 id="pgpkey-bland">
       <title>&a.bland;</title>
       &pgpkey.bland;
     </sect2>
 
     <sect2 id="pgpkey-simon">
       <title>&a.simon;</title>
       &pgpkey.simon;
     </sect2>
 
     <sect2 id="pgpkey-anders">
       <title>&a.anders;</title>
       &pgpkey.anders;
     </sect2>
 
     <sect2 id="pgpkey-obrien">
       <title>&a.obrien;</title>
       &pgpkey.obrien;
     </sect2>
 
     <sect2 id="pgpkey-philip">
       <title>&a.philip;</title>
       &pgpkey.philip;
     </sect2>
 
     <sect2 id="pgpkey-hmp">
       <title>&a.hmp;</title>
       &pgpkey.hmp;
     </sect2>
 		    
     <sect2 id="pgpkey-mp">
       <title>&a.mp;</title>
       &pgpkey.mp;
     </sect2>
 
     <sect2 id="pgpkey-roam">
       <title>&a.roam;</title>
       &pgpkey.roam;
     </sect2>
 
     <sect2 id="pgpkey-den">
       <title>&a.den;</title>
       &pgpkey.den;
     </sect2>
 
     <sect2 id="pgpkey-pirzyk">
       <title>&a.pirzyk;</title>
       &pgpkey.pirzyk;
     </sect2>
 
     <sect2 id="pgpkey-jdp">
       <title>&a.jdp;</title>
       &pgpkey.jdp;
     </sect2>
 
     <sect2 id="pgpkey-krion">
       <title>&a.krion;</title>
       &pgpkey.krion;
     </sect2>
 
     <sect2 id="pgpkey-markp">
       <title>&a.markp;</title>
       &pgpkey.markp;
     </sect2>
 
     <sect2 id="pgpkey-thomas">
       <title>&a.thomas;</title>
       &pgpkey.thomas;
     </sect2>
 
     <sect2 id="pgpkey-dfr">
       <title>&a.dfr;</title>
       &pgpkey.dfr;
     </sect2>
 
     <sect2 id="pgpkey-trhodes">
       <title>&a.trhodes;</title>
       &pgpkey.trhodes;
     </sect2>
 
     <sect2 id="pgpkey-benno">
       <title>&a.benno;</title>
       &pgpkey.benno;
     </sect2>
 
     <sect2 id="pgpkey-paul">
       <title>&a.paul;</title>
       &pgpkey.paul;
     </sect2>
 
     <sect2 id="pgpkey-roberto">
       <title>&a.roberto;</title>
       &pgpkey.roberto;
     </sect2>
 
     <sect2 id="pgpkey-guido">
       <title>&a.guido;</title>
       &pgpkey.guido;
     </sect2>
 
+    <sect2 id="pgpkey-niklas">
+      <title>&a.niklas;</title>
+      &pgpkey.niklas;
+    </sect2>
+
     <sect2 id="pgpkey-marks">
       <title>&a.marks;</title>
       &pgpkey.marks;
     </sect2>
 
     <sect2 id="pgpkey-hrs">
       <title>&a.hrs;</title>
       &pgpkey.hrs;
     </sect2>
 
     <sect2 id="pgpkey-wosch">
       <title>&a.wosch;</title>
       &pgpkey.wosch;
     </sect2>
 
     <sect2 id="pgpkey-das">
       <title>&a.das;</title>
       &pgpkey.das;
     </sect2>
 
     <sect2 id="pgpkey-schweikh">
       <title>&a.schweikh;</title>
       &pgpkey.schweikh;
     </sect2>
 
     <sect2 id="pgpkey-gshapiro">
       <title>&a.gshapiro;</title>
       &pgpkey.gshapiro;
     </sect2>
 
     <sect2 id="pgpkey-arun">
       <title>&a.arun;</title>
       &pgpkey.arun;
     </sect2>
 
     <sect2 id="pgpkey-vanilla">
       <title>&a.vanilla;</title>
       &pgpkey.vanilla;
     </sect2>
 
     <sect2 id="pgpkey-cshumway">
       <title>&a.cshumway;</title>
       &pgpkey.cshumway;
     </sect2>
 
     <sect2 id="pgpkey-demon">
       <title>&a.demon;</title>
       &pgpkey.demon;
     </sect2>
 
     <sect2 id="pgpkey-jesper">
       <title>&a.jesper;</title>
       &pgpkey.jesper;
     </sect2>
 
     <sect2 id="pgpkey-scop">
       <title>&a.scop;</title>
       &pgpkey.scop;
     </sect2>
 
     <sect2 id="pgpkey-kensmith">
       <title>&a.kensmith;</title>
       &pgpkey.kensmith;
     </sect2>
 
     <sect2 id="pgpkey-ben">
       <title>&a.ben;</title>
       &pgpkey.ben;
     </sect2>
 
     <sect2 id="pgpkey-des">
       <title>&a.des;</title>
       &pgpkey.des;
     </sect2>
 
     <sect2 id="pgpkey-sobomax">
       <title>&a.sobomax;</title>
       &pgpkey.sobomax;
     </sect2>
 
     <sect2 id="pgpkey-dcs">
       <title>&a.dcs;</title>
       &pgpkey.dcs;
     </sect2>
 
     <sect2 id="pgpkey-brian">
       <title>&a.brian;</title>
       &pgpkey.brian;
     </sect2>
 
     <sect2 id="pgpkey-nsouch">
       <title>&a.nsouch;</title>
       &pgpkey.nsouch;
     </sect2>
 
     <sect2 id="pgpkey-vs">
       <title>&a.vs;</title>
       &pgpkey.vs;
     </sect2>
 
     <sect2 id="pgpkey-gsutter">
       <title>&a.gsutter;</title>
       &pgpkey.gsutter;
     </sect2>
 
     <sect2 id="pgpkey-nyan">
       <title>&a.nyan;</title>
       &pgpkey.nyan;
     </sect2>
 
     <sect2 id="pgpkey-mi">
       <title>&a.mi;</title>
       &pgpkey.mi;
     </sect2>
 
     <sect2 id="pgpkey-gordon">
       <title>&a.gordon;</title>
       &pgpkey.gordon;
     </sect2>
 
     <sect2 id="pgpkey-thierry">
       <title>&a.thierry;</title>
       &pgpkey.thierry;
     </sect2>
 
     <sect2 id="pgpkey-viny">
       <title>&a.viny;</title>
       &pgpkey.viny;
     </sect2>
 
     <sect2 id="pgpkey-nectar">
       <title>&a.nectar;</title>
       &pgpkey.nectar;
     </sect2>
 
     <sect2 id="pgpkey-adamw">
       <title>&a.adamw;</title>
       &pgpkey.adamw;
     </sect2>
 
     <sect2 id="pgpkey-nate">
       <title>&a.nate;</title>
       &pgpkey.nate;
     </sect2>
 
     <sect2 id="pgpkey-wollman">
       <title>&a.wollman;</title>
       &pgpkey.wollman;
     </sect2>
 
     <sect2 id="pgpkey-joerg">
       <title>&a.joerg;</title>
       &pgpkey.joerg;
     </sect2>
 
     <sect2 id="pgpkey-phantom">
       <title>&a.phantom;</title>
       &pgpkey.phantom;
     </sect2>
 
   </sect1>
 </appendix>
 
 <!--
      Local Variables:
      mode: sgml
      sgml-declaration: "../appendix.decl"
      sgml-indent-data: t
      sgml-omittag: nil
      sgml-always-quote-attributes: t
      sgml-parent-document: ("../book.sgml" "part" "appendix")
      End:
 -->
diff --git a/en_US.ISO8859-1/share/sgml/authors.ent b/en_US.ISO8859-1/share/sgml/authors.ent
index b6714663c7..08a800a934 100644
--- a/en_US.ISO8859-1/share/sgml/authors.ent
+++ b/en_US.ISO8859-1/share/sgml/authors.ent
@@ -1,844 +1,846 @@
 <!--
      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.ale "Alex Dupre <email>ale@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.andre "Andre Oppermann <email>andre@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.brueffer "Christian Br&uuml;ffer <email>brueffer@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.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.clement "Clement Laforet <email>clement@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.cperciva "Colin Percival <email>cperciva@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.dhw "David Wolfskill <email>dhw@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.eik "Oliver Eikemeier <email>eik@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.josef "Josef El-Rayes <email>josef@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.le "Lukas Ertl <email>le@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.linimon "Mark Linimon <email>linimon@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.marks "Mark Santcroos <email>marks@FreeBSD.org</email>">
 
 <!ENTITY a.markus "Markus Br&uuml;ffer <email>markus@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.matk "Mathew Kanner <email>matk@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.mlaier "Max Laier <email>mlaier@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.niklas "Niklas Saers <email>niklas@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.pav "Pav Lucistnik <email>pav@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.peadar "Peter Edwards <email>peadar@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.philip "Philip Paeps <email>philip@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.pjd "Pawel Jakub Dawidek <email>pjd@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.rees "Jim Rees <email>rees@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.rik "Roman Kurakin <email>rik@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.rsm "Scott Mitchell <email>rsm@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.sergei "Sergei Kolobov <email>sergei@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.thierry "Thierry Thomas <email>thierry@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.viny "Vincent Tougait <email>viny@FreeBSD.org</email>">
 
 <!ENTITY a.vkashyap "Vinod Kashyap <email>vkashyap@FreeBSD.org</email>">
 
 <!ENTITY a.vs "Volker Stolz <email>vs@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/niklas.key b/share/pgpkeys/niklas.key
new file mode 100644
index 0000000000..4d1db21164
--- /dev/null
+++ b/share/pgpkeys/niklas.key
@@ -0,0 +1,34 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh niklas C822A476;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub  1024D/C822A476 2004-03-09 Niklas Saers <niklas@saers.com>
+     Key fingerprint = C41E F734 AF0E 3D21 7499  9EB1 9A31 2E7E C822 A476
+sub  1024g/81E2FF36 2004-03-09
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEBNxyoRBAC22NnMqcH1hXXkz+jC+U2QGzOJdGHZtLRXDRpS4blFtRgAf4ab
+tZY6LJUMnjmdgaPP3Mc7YE/ITF1hGnzYF2jbJazNm17nMSP/66dGJt9dK4XAE4cc
+5nYo3GnEkacAa1zUvM6e9OGaAIkndBDUW6+a9aSQNcNyMnYL1/APv+wdIwCg2G4C
+N221QrjrGbxVQPiBM51lY98D/11d/h8aOHYkf+nirhIj9GvRmXJfD3RANZUDjOsj
+OKGgUNlXm/AT6I226v9urfdtrhMg+5zdO+I2p7dZMad/RpnSYo0GMdLRzOlN6aoI
++4JYoACq2C7iR8pmItb+L4Nl5nNBwmcLBXD+HaZebGffZy9Uvy/A5G0ty08I8LKm
+5STvA/kBMybZhX+RTq5v1Kzau63bMBJR8MPHyWYAIBW2wTMJM1ndW5RrbIMJ71qC
+8DFFTHFJd97s/fqBMQ9rj094CdDxCYQJUkZy5+qiBkRta//iSlgsi54Xhj9prgPj
+nBMWxUjAI5Ih0VPIp3/z/q5aQRvey8Ro5JWmduzH0KpLv2Qe17QfTmlrbGFzIFNh
+ZXJzIDxuaWtsYXNAc2FlcnMuY29tPoheBBMRAgAeBQJATccqAhsDBgsJCAcDAgMV
+AgMDFgIBAh4BAheAAAoJEJoxLn7IIqR2/y0AnRetbhzvjj3kKOV28bx2Qt+YRA/j
+AJ4yY9wDPJpwq63IsGeo3BYXi32zPbkBDQRATcc5EAQA2SipeeJJjvrzqqILHNA7
+X+m/PAJonO4QhyIEXXMhzNGdiUVJ7wli23gGVF0Cj3V97Yw5KFGco3qOvvsWkO4c
+CLwd3NHbVL6OHKM36LcFd+a6RiJO9qAGGixyqUIkqYeWCmpObihrkZy9WADsSJTc
+/qOrLghJ0GyR4Ga8CoFNT/sAAwUEANfA3lWeTj3QZcDnJZYejt1aJWt7oUBQ/KOc
+HhTjY/A7zkQsAdgbcmuhzSiIH6eoofTwNOl/Kl0ieSdIyFMFfVxrmYEN/HUUUI4q
+J+BgWZgppinaeUEabnZPfY03T+ZanJ3DmB8s8x4HdpFi3jgtWY0KfDhDfHtNIeRu
+CYmLAzjYiEkEGBECAAkFAkBNxzkCGwwACgkQmjEufsgipHbIOQCfSaudT6wnsh4G
+6D9TZkji6aDqUBwAoKqxWnOya/v/MqcgrXGSCih7phIL
+=Hz+C
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>