diff --git a/share/pgpkeys/lofi.key b/share/pgpkeys/lofi.key
new file mode 100644
index 0000000000..3f42b26cb0
--- /dev/null
+++ b/share/pgpkeys/lofi.key
@@ -0,0 +1,78 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh lofi 6B2974B0;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub  1024D/6B2974B0 2002-06-06 Michael Nottebrock <michaelnottebrock@gmx.net>
+     Key fingerprint = 1079 3C72 0726 F300 B8EC  60F9 5E17 3AF1 6B29 74B0
+uid                            Michael Nottebrock <lofi@freebsd.org>
+uid                            Michael Nottebrock <lofi@tigress.com>
+uid                            Michael Nottebrock <lofi@lofi.dyndns.org>
+uid                            Michael Nottebrock <michaelnottebrock@web.de>
+uid                            Michael Nottebrock <michaelnottebrock@meitner.wh.uni-dortmund.de>
+sub  1024g/EF652E04 2002-06-06 [expires: 2004-06-15]
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+isNkDxI+R1w=
+=LE25
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 462203e3d7..e3b82bad7b 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -1,129 +1,130 @@
 <!-- $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.krion SYSTEM "krion.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.lofi SYSTEM "lofi.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">