diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
index 5c3ae527f6..f9d60ead91 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
@@ -1,464 +1,469 @@
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
 <!--
 
   Do not edit this file except as instructed by the addkey.sh script.
 
   See the README file in this directory 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>
       <title>FreeBSD Security Officer
 	<email>security-officer@FreeBSD.org</email></title>
       &pgpkey.security-officer;
     </sect2>
 
     <sect2>
       <title>FreeBSD core secretary
 	<email>core-secretary@FreeBSD.org</email></title>
       &pgpkey.core-secretary;
     </sect2>
 
   </sect1>
   
   <sect1 id="pgpkeys-core">
     <title>Core Team Members</title>
 
     <sect2>
       <title>&a.jkh;</title>
       &pgpkey.jkh;      
     </sect2>
     
     <sect2>
       <title>&a.imp;</title>
       &pgpkey.imp;      
     </sect2>
     
     <sect2>
       <title>&a.peter;</title>
       &pgpkey.peter;      
     </sect2>
     
     <sect2>
       <title>&a.dfr;</title>
       &pgpkey.dfr;      
     </sect2>
     
   </sect1>
   
   <sect1 id="pgpkeys-developers">
     <title>Developers</title>
 
     <sect2>
       <title>&a.will;</title>
       &pgpkey.will;
     </sect2>
 
     <sect2>
       <title>&a.asami;</title>
       &pgpkey.asami;
     </sect2>
 
     <sect2>
       <title>&a.tobez;</title>
       &pgpkey.tobez;      
     </sect2>
 
     <sect2>
       <title>&a.mbr;</title>
       &pgpkey.mbr;
     </sect2>
 
     <sect2>
       <title>&a.jmb;</title>
       &pgpkey.jmb;
     </sect2>
     
     <sect2>
       <title>&a.wilko;</title>
       &pgpkey.wilko;
     </sect2>
 
     <sect2>
       <title>&a.ache;</title>
       &pgpkey.ache;
     </sect2>
 
     <sect2>
       <title>&a.cjc;</title>
       &pgpkey.cjc;
     </sect2>
 
     <sect2>
       <title>&a.nik;</title>
       &pgpkey.nik;
     </sect2>
 
     <sect2>
       <title>&a.brooks;</title>
       &pgpkey.brooks;
     </sect2>
 
     <sect2>
       <title>&a.bsd;</title>
       &pgpkey.bsd;
     </sect2>
 
     <sect2>
       <title>&a.dd;</title>
       &pgpkey.dd;
     </sect2>
 
     <sect2>
       <title>&a.ue;</title>
       &pgpkey.ue;
     </sect2>
 
     <sect2>
       <title>&a.jedgar;</title>
       &pgpkey.jedgar;
     </sect2>
     
     <sect2>
       <title>&a.green;</title>
       &pgpkey.green;
     </sect2>
 
     <sect2>
       <title>&a.lioux;</title>
       &pgpkey.lioux;
     </sect2>
 
     <sect2>
       <title>&a.petef;</title>
       &pgpkey.petef;
     </sect2>
 
     <sect2>
       <title>&a.patrick;</title>
       &pgpkey.patrick;
     </sect2>
     
     <sect2>
       <title>&a.jmg;</title>
       &pgpkey.jmg;
     </sect2>
 
     <sect2>
       <title>&a.dannyboy;</title>
       &pgpkey.dannyboy;
     </sect2>
 
     <sect2>
       <title>&a.jhay;</title>
       &pgpkey.jhay;
     </sect2>
 
     <sect2>
       <title>&a.mikeh;</title>
       &pgpkey.mikeh;
     </sect2>
 
     <sect2>
       <title>&a.ghelmer;</title>
       &pgpkey.ghelmer;
     </sect2>
 
     <sect2>
       <title>&a.trevor;</title>
       &pgpkey.trevor;
     </sect2>
 
     <sect2>
       <title>&a.phk;</title>
       &pgpkey.phk;
     </sect2>
     
     <sect2>
       <title>&a.joe;</title>
       &pgpkey.joe;
     </sect2>
 
     <sect2>
       <title>&a.kris;</title>
       &pgpkey.kris;
     </sect2>
 
     <sect2>
       <title>&a.keramida;</title>
       &pgpkey.keramida;
     </sect2>
  
     <sect2>
       <title>&a.fjoe;</title>
       &pgpkey.fjoe;
     </sect2>
     	
     <sect2>
       <title>&a.andreas;</title>
       &pgpkey.andreas;
     </sect2>
 
     <sect2>
       <title>&a.jkoshy;</title>
       &pgpkey.jkoshy;
     </sect2>
 
     <sect2>
       <title>&a.kuriyama;</title>
       &pgpkey.kuriyama;
     </sect2>
 
     <sect2>
       <title>&a.alex;</title>
       &pgpkey.alex;
     </sect2>
 
     <sect2>
       <title>&a.ijliao;</title>
       &pgpkey.ijliao;
     </sect2>
 
     <sect2>
       <title>&a.clive;</title>
       &pgpkey.clive;
     </sect2>
 
     <sect2>
       <title>&a.bmah;</title>
       &pgpkey.bmah;
     </sect2>
 
     <sect2>
       <title>&a.dwmalone;</title>
       &pgpkey.dwmalone;
     </sect2>
 
     <sect2>
       <title>&a.matusita;</title>
       &pgpkey.matusita;
     </sect2>
 
     <sect2>
       <title>&a.ken;</title>
       &pgpkey.ken;
     </sect2>
 
     <sect2>
       <title>&a.dinoex;</title>
       &pgpkey.dinoex;
     </sect2>
 
     <sect2>
       <title>&a.sanpei;</title>
       &pgpkey.sanpei;
     </sect2>
 
     <sect2>
       <title>&a.jim;</title>
       &pgpkey.jim;
     </sect2>
 
+    <sect2>
+      <title>&a.marcel;</title>
+      &pgpkey.marcel;
+    </sect2>
+
     <sect2>
       <title>&a.tmm;</title>
       &pgpkey.tmm;
     </sect2>
 
     <sect2>
       <title>&a.rich;</title>
       &pgpkey.rich;
     </sect2>
     
     <sect2>
       <title>&a.knu;</title>
       &pgpkey.knu;
     </sect2>
     
     <sect2>
       <title>&a.max;</title>
       &pgpkey.max;
     </sect2>
 
     <sect2>
       <title>&a.anders;</title>
       &pgpkey.anders;
     </sect2>
     
     <sect2>
       <title>&a.obrien;</title>
       &pgpkey.obrien;
     </sect2>
 
     <sect2>
       <title>&a.mp;</title>
       &pgpkey.mp;
     </sect2>
 
     <sect2>
       <title>&a.roam;</title>
       &pgpkey.roam;
     </sect2>
 
     <sect2>
       <title>&a.pirzyk;</title>
       &pgpkey.pirzyk;
     </sect2>
 
     <sect2>
       <title>&a.jdp;</title>
       &pgpkey.jdp;
     </sect2>
     
     <sect2>
       <title>&a.markp;</title>
       &pgpkey.markp;
     </sect2>
 
     <sect2>
       <title>&a.benno;</title>
       &pgpkey.benno;
     </sect2>
 
     <sect2>
       <title>&a.roberto;</title>
       &pgpkey.roberto;
     </sect2>
 
     <sect2>
       <title>&a.guido;</title>
       &pgpkey.guido;
     </sect2>
 
     <sect2>
       <title>&a.wosch;</title>
       &pgpkey.wosch;
     </sect2>
 
     <sect2>
       <title>&a.schweikh;</title>
       &pgpkey.schweikh;
     </sect2>
 
     <sect2>
       <title>&a.gshapiro;</title>
       &pgpkey.gshapiro;
     </sect2>
 
     <sect2>
       <title>&a.vanilla;</title>
       &pgpkey.vanilla;
     </sect2>
 
     <sect2>
       <title>&a.cshumway;</title>
       &pgpkey.cshumway;
     </sect2>
 
     <sect2>
       <title>&a.demon;</title>
       &pgpkey.demon;
     </sect2>
 
     <sect2>
       <title>&a.jesper;</title>
       &pgpkey.jesper;
     </sect2>
 
     <sect2>
       <title>&a.ben;</title>
       &pgpkey.ben;
     </sect2>
 
     <sect2>
       <title>&a.des;</title>
       &pgpkey.des;
     </sect2>
     
     <sect2>
       <title>&a.sobomax;</title>
       &pgpkey.sobomax;
     </sect2>
     
     <sect2>
       <title>&a.dcs;</title>
       &pgpkey.dcs;
     </sect2>
 
     <sect2>
       <title>&a.brian;</title>
       &pgpkey.brian;
     </sect2>
 
     <sect2>
       <title>&a.murray;</title>
       &pgpkey.murray;
     </sect2>
 
     <sect2>
       <title>&a.gsutter;</title>
       &pgpkey.gsutter;
     </sect2>
 
     <sect2>
       <title>&a.nyan;</title>
       &pgpkey.nyan;
     </sect2>
 
     <sect2>
       <title>&a.mi;</title>
       &pgpkey.mi;
     </sect2>
 
     <sect2>
       <title>&a.nectar;</title>
       &pgpkey.nectar;
     </sect2>
 
     <sect2>
       <title>&a.nate;</title>
       &pgpkey.nate;
     </sect2>
 
     <sect2>
       <title>&a.wollman;</title>
       &pgpkey.wollman;
     </sect2>
 
     <sect2>
       <title>&a.joerg;</title>
       &pgpkey.joerg;
     </sect2>
 
     <sect2>
       <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/books/handbook/pgpkeys/marcel.key b/en_US.ISO8859-1/books/handbook/pgpkeys/marcel.key
new file mode 100644
index 0000000000..25b814e942
--- /dev/null
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/marcel.key
@@ -0,0 +1,36 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh marcel 61EE89F6;
+-->
+<programlisting><![CDATA[
+pub  1024D/61EE89F6 2002-02-09 Marcel Moolenaar <marcel@xcllnt.net>
+     Key fingerprint = 68BB E2B7 49AA FF69 CA3A  DF71 A605 A52D 61EE 89F6
+sub  1024g/6EAAB456 2002-02-09
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.0.6 (FreeBSD)
+Comment: For info see http://www.gnupg.org
+
+mQGiBDxk42sRBACyzSSCLYA90zaZoMlg4zhMXhciG/YuiBZ005q0s9W9cuFFxwOM
+0mLFbBHQKj5TG5TNswnf9VreRg8lRPCzgQ63atc10RU2tfa88hIjWZ4G4WEFDeXS
+hlj4dIA6KO93UEoJmIyR7hswisb086mK4dM9hq9FxJT7YQ63PkUYmd+pfwCgjX/y
+xM6+aPj0sXuOvAcVVmrnp8UD/2pEd8kxAKIaWmxOm9aGB0/E6vjZWxCk1+CO7tgG
+4gInFYUnqniPB4JOXOWriwBGPx5IqWYwYpgeuoi/KeE/Wn7bRUEeCbBGEmJkHO9l
+3xJuPX8JKDkGuTNDvR3SINKSzx7gb77eGorwxV7e4FXBeXOyXLxgDqDhh7Sjv5/4
+ikr2A/99b5t1akHlNe1ITpuEETDNRcfu38/KW/nF3p1IKQ4Q+exSlEJzPFupYNoZ
+O7uD3A0YCNf3jIY52ufkZXqhqfsp6aRLetbqDcKVrZWSudAzGAEk3Q85a6Ei4mUB
+tfv4dmXQOLzfAFHezhCQIt5LIPJ5Dmz/a26+u0DmlfisgP5ltbQkTWFyY2VsIE1v
+b2xlbmFhciA8bWFyY2VsQHhjbGxudC5uZXQ+iFcEExECABcFAjxk42sFCwcKAwQD
+FQMCAxYCAQIXgAAKCRCmBaUtYe6J9pN3AJ982m/rtLgyiuHl1IM+/xfsZ460SACb
+BM7V955SU4T2b+1FW1ieOuuZEKC5AQ0EPGTjbBAEAKbxUKuiOJsAQnGKTXtbyRdR
+Y6BZQK9tPNXEIjIUZ94Crs9lVq/P3kyvpR/ziL+Yt3agUAELiX+cggUZ5KRzKBmo
+PJ6ZdWOuKLRN2+PfK1QVOQayeZV11XZAsPwyHI2v/hvjJnFvQNTEXWLZsBNnfTdx
+0zi5RBNhf5Gt1hyuT4cvAAMFA/9xKQ7aKkvi+C7KafwH6B5X6lIQxRbTQuaZaqKL
+M8pDmVLqo3er7S1ullwMWfarQLHtlwirX9IOQN833TCDev9QeeYZZ5g2MpWO5nx4
+kxEOAK6Lg+QBg4RcoLK9CpHUpLoChGQzNaDudztUixwVaaigj21O4PXFr9pmLLZk
+vj7AN4hGBBgRAgAGBQI8ZONsAAoJEKYFpS1h7on2XgAAnj0B9B7g4XPMXjizKVNP
+YLC2BYjgAJ4tZI/tGYxHex5RCeFv/fG4wN593g==
+=R/4a
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent b/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent
index db180accff..439cd70b0c 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent
@@ -1,84 +1,85 @@
 <!-- $FreeBSD$ -->
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
 <!ENTITY pgpkey.alex SYSTEM "alex.key">
 <!ENTITY pgpkey.anders SYSTEM "anders.key">
 <!ENTITY pgpkey.andreas SYSTEM "andreas.key">
 <!ENTITY pgpkey.asami SYSTEM "asami.key">
 <!ENTITY pgpkey.ben SYSTEM "ben.key">
 <!ENTITY pgpkey.benno SYSTEM "benno.key">
 <!ENTITY pgpkey.bmah SYSTEM "bmah.key">
 <!ENTITY pgpkey.brian SYSTEM "brian.key">
 <!ENTITY pgpkey.brooks SYSTEM "brooks.key">
 <!ENTITY pgpkey.bsd SYSTEM "bsd.key">
 <!ENTITY pgpkey.cjc SYSTEM "cjc.key">
 <!ENTITY pgpkey.clive SYSTEM "clive.key">
 <!ENTITY pgpkey.core-secretary SYSTEM "core-secretary.key">
 <!ENTITY pgpkey.cshumway SYSTEM "cshumway.key">
 <!ENTITY pgpkey.dannyboy SYSTEM "dannyboy.key">
 <!ENTITY pgpkey.dcs SYSTEM "dcs.key">
 <!ENTITY pgpkey.dd SYSTEM "dd.key">
 <!ENTITY pgpkey.demon SYSTEM "demon.key">
 <!ENTITY pgpkey.des SYSTEM "des.key">
 <!ENTITY pgpkey.dfr SYSTEM "dfr.key">
 <!ENTITY pgpkey.dinoex SYSTEM "dinoex.key">
 <!ENTITY pgpkey.dwmalone SYSTEM "dwmalone.key">
 <!ENTITY pgpkey.fjoe SYSTEM "fjoe.key">
 <!ENTITY pgpkey.ghelmer SYSTEM "ghelmer.key">
 <!ENTITY pgpkey.green SYSTEM "green.key">
 <!ENTITY pgpkey.gshapiro SYSTEM "gshapiro.key">
 <!ENTITY pgpkey.gsutter SYSTEM "gsutter.key">
 <!ENTITY pgpkey.guido SYSTEM "guido.key">
 <!ENTITY pgpkey.ijliao SYSTEM "ijliao.key">
 <!ENTITY pgpkey.imp SYSTEM "imp.key">
 <!ENTITY pgpkey.jdp SYSTEM "jdp.key">
 <!ENTITY pgpkey.jedgar SYSTEM "jedgar.key">
 <!ENTITY pgpkey.jesper SYSTEM "jesper.key">
 <!ENTITY pgpkey.jhay SYSTEM "jhay.key">
 <!ENTITY pgpkey.jim SYSTEM "jim.key">
 <!ENTITY pgpkey.jkh SYSTEM "jkh.key">
 <!ENTITY pgpkey.jkoshy SYSTEM "jkoshy.key">
 <!ENTITY pgpkey.jmb SYSTEM "jmb.key">
 <!ENTITY pgpkey.jmg SYSTEM "jmg.key">
 <!ENTITY pgpkey.joe SYSTEM "joe.key">
 <!ENTITY pgpkey.joerg SYSTEM "joerg.key">
 <!ENTITY pgpkey.ken SYSTEM "ken.key">
 <!ENTITY pgpkey.keramida SYSTEM "keramida.key">
 <!ENTITY pgpkey.knu SYSTEM "knu.key">
 <!ENTITY pgpkey.kris SYSTEM "kris.key">
 <!ENTITY pgpkey.kuriyama SYSTEM "kuriyama.key">
 <!ENTITY pgpkey.lioux SYSTEM "lioux.key">
+<!ENTITY pgpkey.marcel SYSTEM "marcel.key">
 <!ENTITY pgpkey.markp SYSTEM "markp.key">
 <!ENTITY pgpkey.matusita SYSTEM "matusita.key">
 <!ENTITY pgpkey.max SYSTEM "max.key">
 <!ENTITY pgpkey.mbr SYSTEM "mbr.key">
 <!ENTITY pgpkey.mi SYSTEM "mi.key">
 <!ENTITY pgpkey.mikeh SYSTEM "mikeh.key">
 <!ENTITY pgpkey.mp SYSTEM "mp.key">
 <!ENTITY pgpkey.murray SYSTEM "murray.key">
 <!ENTITY pgpkey.nate SYSTEM "nate.key">
 <!ENTITY pgpkey.nectar SYSTEM "nectar.key">
 <!ENTITY pgpkey.nik SYSTEM "nik.key">
 <!ENTITY pgpkey.nyan SYSTEM "nyan.key">
 <!ENTITY pgpkey.obrien SYSTEM "obrien.key">
 <!ENTITY pgpkey.patrick SYSTEM "patrick.key">
 <!ENTITY pgpkey.petef SYSTEM "petef.key">
 <!ENTITY pgpkey.peter SYSTEM "peter.key">
 <!ENTITY pgpkey.phantom SYSTEM "phantom.key">
 <!ENTITY pgpkey.phk SYSTEM "phk.key">
 <!ENTITY pgpkey.pirzyk SYSTEM "pirzyk.key">
 <!ENTITY pgpkey.rich SYSTEM "rich.key">
 <!ENTITY pgpkey.roam SYSTEM "roam.key">
 <!ENTITY pgpkey.roberto SYSTEM "roberto.key">
 <!ENTITY pgpkey.sanpei SYSTEM "sanpei.key">
 <!ENTITY pgpkey.schweikh SYSTEM "schweikh.key">
 <!ENTITY pgpkey.security-officer SYSTEM "security-officer.key">
 <!ENTITY pgpkey.sobomax SYSTEM "sobomax.key">
 <!ENTITY pgpkey.tmm SYSTEM "tmm.key">
 <!ENTITY pgpkey.tobez SYSTEM "tobez.key">
 <!ENTITY pgpkey.trevor SYSTEM "trevor.key">
 <!ENTITY pgpkey.ue SYSTEM "ue.key">
 <!ENTITY pgpkey.vanilla SYSTEM "vanilla.key">
 <!ENTITY pgpkey.wilko SYSTEM "wilko.key">
 <!ENTITY pgpkey.will SYSTEM "will.key">
 <!ENTITY pgpkey.wollman SYSTEM "wollman.key">
 <!ENTITY pgpkey.wosch SYSTEM "wosch.key">