diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index f5dcb6f12e..5487432793 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -1,127 +1,128 @@
 <!-- $FreeBSD$ -->
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
 <!ENTITY pgpkey.adamw SYSTEM "adamw.key">
 <!ENTITY pgpkey.alex SYSTEM "alex.key">
 <!ENTITY pgpkey.anders SYSTEM "anders.key">
 <!ENTITY pgpkey.andreas SYSTEM "andreas.key">
 <!ENTITY pgpkey.arun SYSTEM "arun.key">
 <!ENTITY pgpkey.arved SYSTEM "arved.key">
 <!ENTITY pgpkey.asami SYSTEM "asami.key">
 <!ENTITY pgpkey.ben SYSTEM "ben.key">
 <!ENTITY pgpkey.benno SYSTEM "benno.key">
 <!ENTITY pgpkey.billf SYSTEM "billf.key">
 <!ENTITY pgpkey.blackend SYSTEM "blackend.key">
 <!ENTITY pgpkey.bmah SYSTEM "bmah.key">
 <!ENTITY pgpkey.brian SYSTEM "brian.key">
 <!ENTITY pgpkey.brooks SYSTEM "brooks.key">
 <!ENTITY pgpkey.brueffer SYSTEM "brueffer.key">
 <!ENTITY pgpkey.bsd SYSTEM "bsd.key">
 <!ENTITY pgpkey.ceri SYSTEM "ceri.key">
 <!ENTITY pgpkey.cjc SYSTEM "cjc.key">
 <!ENTITY pgpkey.cjh SYSTEM "cjh.key">
 <!ENTITY pgpkey.clive SYSTEM "clive.key">
 <!ENTITY pgpkey.core-secretary SYSTEM "core-secretary.key">
 <!ENTITY pgpkey.cshumway SYSTEM "cshumway.key">
 <!ENTITY pgpkey.daichi SYSTEM "daichi.key">
 <!ENTITY pgpkey.dannyboy SYSTEM "dannyboy.key">
 <!ENTITY pgpkey.das SYSTEM "das.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.dougb SYSTEM "dougb.key">
 <!ENTITY pgpkey.dwmalone SYSTEM "dwmalone.key">
 <!ENTITY pgpkey.erwin SYSTEM "erwin.key">
 <!ENTITY pgpkey.fanf SYSTEM "fanf.key">
 <!ENTITY pgpkey.fjoe SYSTEM "fjoe.key">
 <!ENTITY pgpkey.foxfair SYSTEM "foxfair.key">
 <!ENTITY pgpkey.ghelmer SYSTEM "ghelmer.key">
 <!ENTITY pgpkey.gioria SYSTEM "gioria.key">
 <!ENTITY pgpkey.gordon SYSTEM "gordon.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.harti SYSTEM "harti.key">
 <!ENTITY pgpkey.hrs SYSTEM "hrs.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.jon SYSTEM "jon.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.leeym SYSTEM "leeym.key">
 <!ENTITY pgpkey.lioux SYSTEM "lioux.key">
 <!ENTITY pgpkey.luoqi SYSTEM "luoqi.key">
 <!ENTITY pgpkey.maho SYSTEM "maho.key">
 <!ENTITY pgpkey.marcel SYSTEM "marcel.key">
 <!ENTITY pgpkey.marcus SYSTEM "marcus.key">
 <!ENTITY pgpkey.markp SYSTEM "markp.key">
 <!ENTITY pgpkey.matusita SYSTEM "matusita.key">
 <!ENTITY pgpkey.max SYSTEM "max.key">
 <!ENTITY pgpkey.maxim SYSTEM "maxim.key">
 <!ENTITY pgpkey.mbr SYSTEM "mbr.key">
 <!ENTITY pgpkey.mi SYSTEM "mi.key">
 <!ENTITY pgpkey.mich SYSTEM "mich.key">
 <!ENTITY pgpkey.mikeh SYSTEM "mikeh.key">
 <!ENTITY pgpkey.mp SYSTEM "mp.key">
 <!ENTITY pgpkey.mtm SYSTEM "mtm.key">
 <!ENTITY pgpkey.murray SYSTEM "murray.key">
 <!ENTITY pgpkey.mux SYSTEM "mux.key">
 <!ENTITY pgpkey.nate SYSTEM "nate.key">
 <!ENTITY pgpkey.nectar SYSTEM "nectar.key">
 <!ENTITY pgpkey.netchild SYSTEM "netchild.key">
 <!ENTITY pgpkey.nik SYSTEM "nik.key">
 <!ENTITY pgpkey.nsouch SYSTEM "nsouch.key">
 <!ENTITY pgpkey.nyan SYSTEM "nyan.key">
 <!ENTITY pgpkey.obraun SYSTEM "obraun.key">
 <!ENTITY pgpkey.obrien SYSTEM "obrien.key">
 <!ENTITY pgpkey.patrick SYSTEM "patrick.key">
 <!ENTITY pgpkey.paul SYSTEM "paul.key">
 <!ENTITY pgpkey.perky SYSTEM "perky.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.ru SYSTEM "ru.key">
 <!ENTITY pgpkey.rushani SYSTEM "rushani.key">
 <!ENTITY pgpkey.sanpei SYSTEM "sanpei.key">
 <!ENTITY pgpkey.schweikh SYSTEM "schweikh.key">
 <!ENTITY pgpkey.scop SYSTEM "scop.key">
 <!ENTITY pgpkey.scottl SYSTEM "scottl.key">
 <!ENTITY pgpkey.seanc SYSTEM "seanc.key">
 <!ENTITY pgpkey.security-officer SYSTEM "security-officer.key">
 <!ENTITY pgpkey.sheldonh SYSTEM "sheldonh.key">
+<!ENTITY pgpkey.simon SYSTEM "simon.key">
 <!ENTITY pgpkey.sobomax SYSTEM "sobomax.key">
 <!ENTITY pgpkey.thomas SYSTEM "thomas.key">
 <!ENTITY pgpkey.tmm SYSTEM "tmm.key">
 <!ENTITY pgpkey.tobez SYSTEM "tobez.key">
 <!ENTITY pgpkey.trevor SYSTEM "trevor.key">
 <!ENTITY pgpkey.trhodes SYSTEM "trhodes.key">
 <!ENTITY pgpkey.ue SYSTEM "ue.key">
 <!ENTITY pgpkey.vanilla SYSTEM "vanilla.key">
 <!ENTITY pgpkey.wes SYSTEM "wes.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">
 <!ENTITY pgpkey.yoichi SYSTEM "yoichi.key">
diff --git a/share/pgpkeys/simon.key b/share/pgpkeys/simon.key
new file mode 100644
index 0000000000..d2a9899f1e
--- /dev/null
+++ b/share/pgpkeys/simon.key
@@ -0,0 +1,51 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh simon 780F4D1C;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub  1024D/780F4D1C 2001-06-09 Simon L. Nielsen <simon@nitro.dk>
+     Key fingerprint = F3DA F249 97D3 A94F A323  EC5E F24A 1C15 780F 4D1C
+uid                            Simon L. Nielsen <simonln@diku.dk>
+uid                            Simon L. Nielsen <simonln@spamcop.net>
+uid                            Simon L. Nielsen <simon@FreeBSD.org>
+sub  1024g/8E408C32 2001-06-09 [expires: 2004-12-31]
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBDsigS0RBACDXN+3VnMjgExU5aIEFIbIRkik0dCz6STMDeyiQn4MnOago6De
+I+1UCGgnX9YfWpejQ2UWHdYFG973/zBuzU1yF70EZIao8Ih5CS/YVFYhdku7icNJ
+p1v4XJ4ZyLu/5iPew+Sa55ar9YwSbNJz31qLnjH2m+oBqGlr/rtdZJOfSwCg3Tgk
+dpjRgsci8fNoJgF7HkGv4/kD/3nAZjBxof/ZNgEq5yI/aNLa/7ICHHk4BnPtFVlk
+cSN/ZyWXjJgafIn9+5NE/jBeK8eAFJgojU49Xrd3NHETY/9lO74r/ptRwv0C986R
+E8R5si+tZXsgrfJ9XzY9aNHfoyMwB+z8l0XexOlkNEwEpRF+2A0eKWi4hhu+Ylot
+WPzZA/9kZesR8siawbX9IdmXs+ShZqAOB1Iq5A/zEn4OhVRtVsSu2mM1PliubQ+d
+H14gKXN0AukRZZ6/Hp+KWQJ+qrRWR9av4we7fnKlqPY8srugjDX4IpLd6ya3Qzfu
+pOK3AiHbUbrDc4HUlffEOG/gX4Of1GdpZqQnz1lmFtUbBjdgT7QhU2ltb24gTC4g
+TmllbHNlbiA8c2ltb25Abml0cm8uZGs+iGUEExECACUCGwMFCQay0RUECwcDAgMV
+AgMDFgIBAh4BAheAAhkBBQI9/IHDAAoJEPJKHBV4D00cYzUAnRmcT6xEU9xnIzY1
+G1d79XwUj1c+AJ9Ku5oywz5o4dWEtgBOaIQ8m71yaohMBBMRAgAMBQI99L6zBYMA
+8Cl6AAoJEJAw63Mh/xCurGwAni6EKBUMjiV88iXrQvNDf98O5dVgAJ9hI6fl/EBF
+4M0tXNu/7DOdXerbzbQiU2ltb24gTC4gTmllbHNlbiA8c2ltb25sbkBkaWt1LmRr
+PohiBBMRAgAiBQI9/IHKAhsDBQkGstEVBAsHAwIDFQIDAxYCAQIeAQIXgAAKCRDy
+ShwVeA9NHOCIAKDcXbb2yR/pAmcFsKi4xzORsKJKZACfQY7CuhRF7FKaKnWFok5V
+2kn7L06ITAQTEQIADAUCPfS+swWDAPApegAKCRCQMOtzIf8QrjQLAJwLgsiD77bn
+QD0EUV0ijwRG8tvcTQCgzrqjRopzYU83BuMegfYSYtVWf1a0JlNpbW9uIEwuIE5p
+ZWxzZW4gPHNpbW9ubG5Ac3BhbWNvcC5uZXQ+iGIEExECACIFAj38gcoCGwMFCQay
+0RUECwcDAgMVAgMDFgIBAh4BAheAAAoJEPJKHBV4D00cWIcAn2ylxGpIeUEBVZUB
+RfAUXvlAzScIAJ983p31DJPWbM3pqWFhEmyABUrTQYhMBBMRAgAMBQI99L6zBYMA
+8Cl6AAoJEJAw63Mh/xCu1AAAoN95xicy0MoTccCyTjRJpH6uoQiPAJ9e+rU0pL1O
+bbJhjjOAfhRbQ/Xe9bQkU2ltb24gTC4gTmllbHNlbiA8c2ltb25ARnJlZUJTRC5v
+cmc+iGQEExECACQFAj8Zwc4CGwMFCQay0RUGCwkIBwMCAxUCAwMWAgECHgECF4AA
+CgkQ8kocFXgPTRxHpwCg2bOuP9wbSIpizLXiaohCRHfu0J4An0rCUJRxu9ORzGnO
+3QsP58x6z4i5uQENBDsigS8QBADs7Ol9PzFKyxno/Y77A3nyKFahOImtiWaltVPb
++oOHWEc61u8H2i/sRJpaHmYbZ1Aq51CGNF1vnkcBIOWr5SRuamjhRy5vk8Li59aN
+G2CMlH1gPOkaiOTMaNdaH21aONzwJi823e1pwZwMpdKq6X8IW2fnB5iWOMbPdeh/
+VK18mwADBgP/YUUlutMFHMBrj1Hg7AbyU69NOzrhdyD3Vuew4yWIlvTfn2NrSaTF
+0hqZRPNyyDYbfAO1v0TnCqkbcObbTsXQOV14+CKsT414ckewkFksgU+4jH7+x+zh
+MPLn0W6WgrYvCFtppe7BHlLmxPrE+fpQW2GCVJ8FAQMqZK5S0AxNWoWITAQYEQIA
+DAUCPfyCDAUJBrLRXQAKCRDyShwVeA9NHKsjAJ4jzQUSY0uyI9Z3EAGMHn0hXq46
+MACbBOC2nrMUNMyV/g4EIndT8Ev1Woo=
+=AglW
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>