diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 0c30d6354c..0471411ed5 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -1,143 +1,144 @@
 <!-- $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.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.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.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.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.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.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.pav SYSTEM "pav.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.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.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/pjd.key b/share/pgpkeys/pjd.key
new file mode 100644
index 0000000000..105e992861
--- /dev/null
+++ b/share/pgpkeys/pjd.key
@@ -0,0 +1,48 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh pjd B1293F34;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub  1024D/B1293F34 2004-02-02 Pawel Jakub Dawidek <Pawel@Dawidek.net>
+     Key fingerprint = A3A3 5B4D 9CF9 2312 0783  1B1D 168A EF5D B129 3F34
+uid                            Pawel Jakub Dawidek <pjd@FreeBSD.org>
+uid                            Pawel Jakub Dawidek <pjd@FreeBSD.pl>
+sub  2048g/3EEC50A7 2004-02-02 [expires: 2006-02-01]
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEAeUYARBAD2RoYfLkSt38R06MpFesDgXVvgSb7q2GGTiMLZE7iJ8iKQU7Rx
+DkpW7EkpJ/YGPXro0KumkIGoPCsMF1eLENUhGhyMosN5Yb9Y7DXsOv3QcCKIfBlM
+P3Y+Y7By0GvSYPvYK9GZI2ZvSXyTraxB1eO/7c+aqS7wdwx3bCsVKnyzBwCg+nXQ
+izSD3wmwDYxffxN4dawiD2sD/00L95dq5XhM9nISjWJOjGsPJqyzoZZH2pemOgcq
+SeNimi0yWOWeZh/bxbjUYI5RXdBXGdwQxW6DKFU9o9NFe4se1jZcbPjuRtkbBXqz
+Mkh4kv2pvZ+rHu41kqzOZ0z+rbZld2U28R76xtx3RI4OXvJ8z01RHzAEwJ1G6s3D
+wI6iBADy+KSjJmfgP1rAcNPuwW7T7L2H9fLNTp3mmWZZDj6n4fykcwM9Jtz/K4QE
+i3GHNB2AnmR8yiPE2m87ObsKV7d8UK4WP0OLfbr7d7TZ0jDscBhlyfYgKYDFHaJH
+8O+L7df2oQU31wYEvYOP/mSTPO7F5TJZm3/Pygp/JkKnPDCnY7QlUGF3ZWwgSmFr
+dWIgRGF3aWRlayA8cGpkQEZyZWVCU0Qub3JnPohkBBMRAgAkBQJAHlGAAhsDBQkD
+wmcABgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEBaK712xKT80dOwAoNjy2Xrebr+p
+AQroKNQnIzaR2QysAKCXRA9XldUcwxSOzRJNhDktAKQbZbQkUGF3ZWwgSmFrdWIg
+RGF3aWRlayA8cGpkQEZyZWVCU0QucGw+iGQEExECACQFAkAeUbQCGwMFCQPCZwAG
+CwkIBwMCAxUCAwMWAgECHgECF4AACgkQForvXbEpPzQudACbB3QlE/GfSY+umOHI
+y+3UjdMKuGMAn2JC4vrcEPwg8XMF5iEIaEZ0tNmVtCdQYXdlbCBKYWt1YiBEYXdp
+ZGVrIDxQYXdlbEBEYXdpZGVrLm5ldD6IZAQTEQIAJAUCQB5R1AIbAwUJA8JnAAYL
+CQgHAwIDFQIDAxYCAQIeAQIXgAAKCRAWiu9dsSk/NByVAJ91gG7VGmIK1H1LyHnW
+ZPI8T7WRBwCeP644asOCGfje3+NjA0F9OHoL2z+5Ag0EQB5RhhAIALfZ2Kq/Yd1j
+X4+kdVgCQqHP9tEHjYLwGICL3Y1i+whLqUx/X+MZmt4vNZLaoaqRXhMD8A5c9tN4
+06ODB6afzS0feQE/s3j0bKRviTvUedg+CLvt9anqf092gRt1MnKAAWsw+WNqfCNI
+xsONpWWS5LL11PLyEOhxqsEvcx2IpswjG398MINFwHo7dUielCDpAPgu8tCVLpWb
+GqUBiWdqzq9jxvIS7obYUmr0VBqElP16LrcvoUs8W+AGvkfTZW3iX6yPhfpnycKy
+OnStwtO28Ud2BlRrp1YLJWv8oZcYDP5p0GyhbmCbj6qG+BrA8XbIgASFZHK65CWr
+++Zc5tztIBMAAwUIAJVrsEErdqxbj7qdJXVebkQZLe/hr5fFOGdOwMmvNbsI2nHj
+0B/L8Gfw1v2N6K5ST68mSH5gPpDDkLqDfqY6OcN2LBhVvOdEGJv7kp8x0XK/vsbj
+jARiO6l7ZrtH4E78oiHzYK1yGFNMi6c5zpO6BXRUAVmKptL/BRu0UPRMfScyIbnP
+gT0dcOiTazJ5U9Ol+Mjk4S/YLqe/05JQvmzKzSht6E8BbgiZxwsrWB+CLpLwglbg
+f4NX+BAjApvoesbhkLOY03bSgP6CsRbL7izgVmfAHbOJk5eIYjSEIOcqIMyg3cp0
+kZI7omon6uhjl36Ad1uEwjkW7jPgCz9a62bLr3eITwQYEQIADwUCQB5RhgIbDAUJ
+A8JnAAAKCRAWiu9dsSk/NOa+AKC/grZ0DrDsO9LtCEQKwTcP7EQYBQCgsk9ZmVug
+9caBiftOC/+/0ej5qqg=
+=/cMH
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>