diff --git a/share/pgpkeys/marck.key b/share/pgpkeys/marck.key
new file mode 100644
index 0000000000..802998a838
--- /dev/null
+++ b/share/pgpkeys/marck.key
@@ -0,0 +1,54 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh marck 6B691B03;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub  1024D/6B691B03 2001-07-20 Dmitry Morozovsky <marck@rinet.ru>
+     Key fingerprint = 39AC E336 F03D C0F8 5305  B725 85D4 5045 6B69 1B03
+uid                            Dmitry Morozovsky <marck@FreeBSD.org>
+sub  2048g/44D656F8 2001-07-20
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+KX84wMOTyluPNU+o
+=+K0J
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 801e385a33..1df23ee67f 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -1,165 +1,166 @@
 <!-- $FreeBSD$ -->
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
 <!ENTITY pgpkey.adamw SYSTEM "adamw.key">
 <!ENTITY pgpkey.ale SYSTEM "ale.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.bland SYSTEM "bland.key">
 <!ENTITY pgpkey.bmah SYSTEM "bmah.key">
 <!ENTITY pgpkey.bms SYSTEM "bms.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.bz SYSTEM "bz.key">
 <!ENTITY pgpkey.ceri SYSTEM "ceri.key">
 <!ENTITY pgpkey.cjc SYSTEM "cjc.key">
 <!ENTITY pgpkey.cjh SYSTEM "cjh.key">
 <!ENTITY pgpkey.clement SYSTEM "clement.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.den SYSTEM "den.key">
 <!ENTITY pgpkey.des SYSTEM "des.key">
 <!ENTITY pgpkey.dfr SYSTEM "dfr.key">
 <!ENTITY pgpkey.dhartmei SYSTEM "dhartmei.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.glebius SYSTEM "glebius.key">
 <!ENTITY pgpkey.glewis SYSTEM "glewis.key">
 <!ENTITY pgpkey.gordon SYSTEM "gordon.key">
 <!ENTITY pgpkey.green SYSTEM "green.key">
 <!ENTITY pgpkey.grehan SYSTEM "grehan.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.hmp SYSTEM "hmp.key">
 <!ENTITY pgpkey.hq SYSTEM "hq.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.jhb SYSTEM "jhb.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.josef SYSTEM "josef.key">
 <!ENTITY pgpkey.ken SYSTEM "ken.key">
 <!ENTITY pgpkey.kensmith SYSTEM "kensmith.key">
 <!ENTITY pgpkey.keramida SYSTEM "keramida.key">
 <!ENTITY pgpkey.knu SYSTEM "knu.key">
 <!ENTITY pgpkey.krion SYSTEM "krion.key">
 <!ENTITY pgpkey.kris SYSTEM "kris.key">
 <!ENTITY pgpkey.kuriyama SYSTEM "kuriyama.key">
 <!ENTITY pgpkey.le SYSTEM "le.key">
 <!ENTITY pgpkey.leeym SYSTEM "leeym.key">
 <!ENTITY pgpkey.lioux SYSTEM "lioux.key">
 <!ENTITY pgpkey.lofi SYSTEM "lofi.key">
 <!ENTITY pgpkey.lth SYSTEM "lth.key">
 <!ENTITY pgpkey.luoqi SYSTEM "luoqi.key">
 <!ENTITY pgpkey.maho SYSTEM "maho.key">
 <!ENTITY pgpkey.marcel SYSTEM "marcel.key">
+<!ENTITY pgpkey.marck SYSTEM "marck.key">
 <!ENTITY pgpkey.marcus SYSTEM "marcus.key">
 <!ENTITY pgpkey.markp SYSTEM "markp.key">
 <!ENTITY pgpkey.marks SYSTEM "marks.key">
 <!ENTITY pgpkey.markus SYSTEM "markus.key">
 <!ENTITY pgpkey.mat SYSTEM "mat.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.metal SYSTEM "metal.key">
 <!ENTITY pgpkey.mi SYSTEM "mi.key">
 <!ENTITY pgpkey.mich SYSTEM "mich.key">
 <!ENTITY pgpkey.mikeh SYSTEM "mikeh.key">
 <!ENTITY pgpkey.mlaier SYSTEM "mlaier.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.niklas SYSTEM "niklas.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.pav SYSTEM "pav.key">
 <!ENTITY pgpkey.peadar SYSTEM "peadar.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.philip SYSTEM "philip.key">
 <!ENTITY pgpkey.phk SYSTEM "phk.key">
 <!ENTITY pgpkey.pirzyk SYSTEM "pirzyk.key">
 <!ENTITY pgpkey.pjd SYSTEM "pjd.key">
 <!ENTITY pgpkey.rich SYSTEM "rich.key">
 <!ENTITY pgpkey.rik SYSTEM "rik.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.sergei SYSTEM "sergei.key">
 <!ENTITY pgpkey.sheldonh SYSTEM "sheldonh.key">
 <!ENTITY pgpkey.simon SYSTEM "simon.key">
 <!ENTITY pgpkey.sobomax SYSTEM "sobomax.key">
 <!ENTITY pgpkey.ssouhlal SYSTEM "ssouhlal.key">
 <!ENTITY pgpkey.stefanf SYSTEM "stefanf.key">
 <!ENTITY pgpkey.thierry SYSTEM "thierry.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.viny SYSTEM "viny.key">
 <!ENTITY pgpkey.vkashyap SYSTEM "vkashyap.key">
 <!ENTITY pgpkey.vs SYSTEM "vs.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">