Index: head/share/pgpkeys/pjd.key
===================================================================
--- head/share/pgpkeys/pjd.key	(revision 46572)
+++ head/share/pgpkeys/pjd.key	(revision 46573)
@@ -1,48 +1,112 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh pjd B1293F34;
+sh addkey.sh pjd 954B852BB1285B75 ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" 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]
+pub   rsa4096/0x954B852BB1285B75 2015-04-17 [expires: 2020-04-15]
+      Key fingerprint = B1C5 F673 045B 6C7B AFFB  3A1D 954B 852B B128 5B75
+uid                 [ultimate] Paweł Jakub Dawidek <pjd@FreeBSD.org>
+uid                 [ultimate] Paweł Jakub Dawidek <pawel@dawidek.net>
+uid                 [ultimate] Paweł Jakub Dawidek <p.dawidek@wheelsystems.com>
+uid                 [ultimate] Paweł Jakub Dawidek <p.dawidek@mobter.com>
+sub   rsa4096/0x8EABD55DE4D6A714 2015-04-17 [expires: 2020-04-15]
+
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" 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
+mQINBFUw6dIBEADZyMuLdzuT7M37zD+2zrTKVZrgLf3jHKd4VOdU+KVj4TvirBXs
+AGk0Kyld5dMbjZDxAVKSgviQ6pLvDIwQw/LjwTc/Frbrj0F9DvGCuu1LZKDf5lvL
+8Kfs/uX8hrsQLmjAdY2Rr6/isDzUBUWH5v2uSxTD9l1h7nvVx+B4gpfe2pYvVOTv
+EG3UqbjjUT3d0R2L1X8M2f4yT2FqFp2gbuwJT6N6jr+wFheqhltOW5a1e7aO6Ds4
+Jow1AJ/8vfZ3PHWt7/GE0BIy1oDQLWjK1UQxpklZLKhCWaJlypYLZDkNbiit/cki
+1bbkrbdvgtwFzezqndgmpkUU+9QeXaBit2synjkaz3f4OwwlilAYwu6NUDdJVavu
+IyHzbmLfdTIUYzl4Uc/82aChEFWhHvV+mOluURL9870Fz6K9DoDraymrsyoOeLZ7
+464ofoRo6iL4DfSEIZt02Tu8glQ7HzB77awzU0hPcR/HPAh7j1jXYH8kIPXDHbKj
+km9KHughO1BafKKl8VvWlPOO3dM+BUGaaqCt/ccYie6onvkEJn44Ho8XnlLmWlzy
+XsVW0NB4uuNLkINkC8dQEel3U4ZEIuseqDiitH0RceIbVypCJjdc+p0pmadNxyhL
+W/g2IDsMzc8VLpyQz8sXG+2ZeaGkvVpDAuqUj0hxS6lFpCLRgYhF3R2PIQARAQAB
+tChQYXdlxYIgSmFrdWIgRGF3aWRlayA8cGF3ZWxAZGF3aWRlay5uZXQ+iQI9BBMB
+CgAnBQJVMOnSAhsDBQkJZgGABQsJCAcDBRUKCQgLBRYDAgEAAh4BAheAAAoJEJVL
+hSuxKFt1JKgQAK3IMFCkWelAAl6wM7w4jI+I0HFoQgvvAlWubCiLO/FtVWlDuZYF
+QKQ+VNQ+6OJeC4i6kLi1+JftBTPEChvVbiTISrbQyL7IZNM6aUBmkl2MQY9sxLxr
+k4VUI6dTphjQYOhPPtvpC0EpnrpPqDb+ly9LlsetQG/jeYalzn1JEz3Wke1tvCEW
+fXv5wBXCS+pGAQuKxLeZKCztsH+JTsS+CjPnqRfjVwM1BBpYZ8+Hl/1K1YDLvcLX
+y7wdfWcHiuUclIYgsMJllb9UeO6m/O+3aKadMW9K0TcP0uoEaCsq4beeM2/OToTh
+5P+QLhbeYUBT3yRNYOzf6F/rJHgp58KkXRR428n7uRMPVyGiR8Kauku5onSR36p4
+kTZPvMay0NlkbuzKs7jwn6D/6D0cVUpAS828sRYPhk/30uWLCqWbMspGZxpkVv67
+cziQlaYo78OxfEck7AQGDvWYqqyHwmSlDhxfUZrO/9RoSOpDKWTOh2NoZSP1zGUl
+9dIBthh3Vq7JD4IiBC2uaX4O9h7Nd03l5aBPAbm2LU9O4EgpUCWl5Ue2uUnqhcWi
+H1kD1n5mGicJMVvqVXfak5gy18sJj+BcRCIEMaFDX3bTeZxvgWs0Kwbf4ItKkCF+
++SbjVc1u6VQsigK7eo7AOUh0HAiGBi8+yRuur+OBARiwKlwdMy6ZV3emiEYEEBEC
+AAYFAlUw7TYACgkQForvXbEpPzSYpACgwxoUqZXYwQszwFvWfM1IQxovORgAnAqe
+/33Fz8swMJUm2gIAXrTETZxUtDFQYXdlxYIgSmFrdWIgRGF3aWRlayA8cC5kYXdp
+ZGVrQHdoZWVsc3lzdGVtcy5jb20+iQI9BBMBCgAnBQJVMOoKAhsDBQkJZgGABQsJ
+CAcDBRUKCQgLBRYDAgEAAh4BAheAAAoJEJVLhSuxKFt1N7QP/17mlSMbRCWC1rZX
+eFjl/aryFKNHXGrs+8tx9NGOwlIBwn+Hw3mL/6G2CR0awljntRPdWBuygPfUdnHq
+cmXZBGS9IdeDhGTJcFrnwDVkSOtfekpgKAv4VORuRus+90zu8WTTIbvytSUUuMCD
+6PECfd/2yUu7l5xUs7Gxh2R5ETkDCg86uKQnDiuDVmNHGa8V37QGCFcxyysbKzfk
+9E8f9A/pq9VkpWrdhVVgf2UGdNYXhyt5rQGPdXyY3ywALJORAT2EZRgBSShis54W
+zA3VrC1ykljia65yzq/l1eBMQVJ+wNRd6d6sjh0MFcXS7bEZJ9ABh6g3t3FlJ20y
+94f6RCgR2NncdhdExTvH7HQKWvrEDOFDWIWmQoC1XUWz6vcQux93N/pAYGRPNE2l
+gAvid+GAH1i1D+n9a/OEt6UZMJb2SdZjaoUS5z2AgTMrOdzQdtPlvCLv5GfAo5DY
+BY/JRK4K3GJB1CpjJUP8D9cgRqHNM+2rilPJ9s5YvkDyC+v8rYdycORQpInfCTcg
+/0fxiPuqkFrOTfgRI6cbKnJ+5Tu80VSJpc/Bt42rbnZuCjXhd1oe2e5qXjP2FHdT
+v2YCGUQU7sDncFSxxnKj+W2gK69AHRFXqc05MPX+kMYYbXc28hwcBKDSOLoQzCsW
+3UX2ns9ZwHxz+cJI8KnA/EEtsAI/iEYEEBECAAYFAlUw7TYACgkQForvXbEpPzTU
+cACg8Gtj6WswW57RS5DaL7lF3m8cbscAn2bWM8QNjTu1aQSAbbjPYdiGVgI5tCtQ
+YXdlxYIgSmFrdWIgRGF3aWRlayA8cC5kYXdpZGVrQG1vYnRlci5jb20+iQI9BBMB
+CgAnBQJVMOocAhsDBQkJZgGABQsJCAcDBRUKCQgLBRYDAgEAAh4BAheAAAoJEJVL
+hSuxKFt1tcsP/3Z0XaInn5oBWrKYD8ZmwONULTZkHJF5CUHwxhXV0mM6wD4qTwft
+HhXaPTbqW/65OBE4qdj4YM2c4L/zD5rjLlYBpLVlZP5q1yQS7Eb1n9bbpW263vVH
+u/1+GP+umaVYopgY3sLE+5NsDbn58y9zd0OXaI106qySRqwqB6L1z8pC4YRSATce
+oXnsRbHkEqhTrJPk4B1mxpTZ8YQKpfJNJOcTW3PEAeCuLeyMAU570NRnr4pd8NtJ
+RTaoI1WbxGVDQDAr6IftDP1bkkALi8cucnMByFRh7b5ZuADCW1Aqui6CTLXEVmOR
+QNVIy7R/Llu7QuzW5N9AF45QR/FSZsZG4t/U4MuxinlOEiKVPDkS3d3brTtcxILz
+BN9hFFdAL0HCb7P0msKHpRF9w3tyy93d/ZlEqgLPfi5Vt+nbiLllOVSh2VyY0HAh
+6946Ialo0xiv3VeYbh8GrjfmapwCPB6l+mIjFtPAzr4mbIeiJtzBC3Qi/apA7XFX
+hYdj96DS6oa389PbEYNl9r73w3oYJuyX7lis4CBKd4NtgHdeBYuEKlnteMkGYjb7
+oG/trgiODrVdPyJ6rHUkOR/D6Q7cyQe0TIvkcdGcgOufE0Noi7/I0Mcj9Kd8nhDs
+4Ag+RmYhidtgKHHzav6WmiyTMEgw+SSgBa1+5RU51JHMulxSbeCYKbwhiEYEEBEC
+AAYFAlUw7TYACgkQForvXbEpPzQnjwCgushb6E0bTQEyJ7CGv7sBSfvGfr4AnjSh
+U7/OYF00jwvM2y3SrauvGcUktCZQYXdlxYIgSmFrdWIgRGF3aWRlayA8cGpkQEZy
+ZWVCU0Qub3JnPokCPQQTAQoAJwUCVTDqMQIbAwUJCWYBgAULCQgHAwUVCgkICwUW
+AwIBAAIeAQIXgAAKCRCVS4UrsShbdRTeEACcpbKYbLX4Nh+DWMmoSZ0rC+fD8GB0
+OKKp5zMyN9PFvEW9AVOQOFA+SWP8Eo0qCMPNVkcRp+7zFvOrDLEjgCs/id7pTZr4
+d2el3El04bJH2p62VLemTVBiNf19TRYr9nrZjqOoIB+x7+hwuVQ84HtWCJRBlVpB
+LY7JnXfO50jF4E20T9XBElwLfivsG1mEQFNQD/AGiFSEP3HZs06bMjGnLd30C5oT
+W+NFl2K6urNFAss+pBO/5ZH4zLhgItjZRMYHU8y4rWeBgUq72pcZEQ8begVC/GUy
+E7/mGwtJBpOcBIGG3fZkhIqi3NxRSRrGjQtROA6zubqx/oRWHjl2Wsk6rlFZDUhx
+BwfoY3tqfPnuIe+vyouZK+/IjXENoeeHVgGScJAaffNUw2qYOJILmjFfp904HG+l
+NEEU2xYDgRhBWLxx1QKzTleVZSgbsKUF+ib+IofDhbeO4jo3bgRH2zl02Vu0gdxb
+Vf/rZ8ln1M7nIA0eYFNKiv0FXpFNw00O6/9lsB1uRDpvs3Jb5Zo6e0EzVZBusDB8
+MJPh7RwuSXbe2KLWPTq/GTu5lhfyFrNtI3tnqEXwqYdbM+8CF2gvlN3FMI75peFX
+B63j0liVQmt8R/OikyuteVGBSRxsR06NtS/48xBg6Icq3cPeXcv9V0F9KS7spbR8
+bfsLFg4p+yO0HohGBBARAgAGBQJVMO02AAoJEBaK712xKT80l9gAn0HCFF7LwwFe
+D8d0XndaLkFV7ZmBAJ9CMFfIll6oii7n6g3AWoNMsfIDKrkCDQRVMOnSARAAsu1D
+I8OZkVj7TmQ+wy8KD0iWjaiO1eepbqS+sIdOrlXI++0UfQIi886zU68CrNA/yI6M
+iu80T3pOaCD6JA0JDGnh/skozlr/fwgdeQf02byVKY4Twx/2JJBuGxjdEd53apu+
+FuGPZpD6kJkexq7Q415vUHmRh0vCO0Dr8ChFPgTOm6kzig8NqZwTj6WjRm3gbp23
+TQnkOtWtGp0G9p9VJw6z1j3NPXFmygijbOAX2BdEpnSD6ppLjwRYi9ZafUTZUCiq
+Dj/dwIOMF3FNOVfcbydPpfxDZEQIBNUTljojve78eLN4np4d7vKR6/DBY4PqsIB0
+5uIMmAGcebil9tVqcRqc/FU4xH8raZlhtqhGiiOYMFTKzo1gTBLlua0C99XRQo50
+JFZEIjdJvrlLcfybcaXs4JnKghjrNQT6MwROlsXMFourDuOtJ+6Yv9Zh+1WdIKFf
+YuQkjNXZYKjcFdyiys6lFpqSkVsuR3y9nS2wj9sYniFToOdXwmaecTjc0v0UYdcY
+QSyLhSASw7Hqc70bxMVx8YJPZ3q0Gak8ltpxxVBLsugV4FlEOZHjqzlFS31nFhXg
+QGEPdh/2QlUd4LEsh5o2wMo22uNad/0MsqKealapPe0wv0DxV1SPIZc8GEOzah5e
+gjIrZBZs7wxS0c9v2N7aiOVYQYt3ehMCi351Az8AEQEAAYkCJQQYAQoADwUCVTDp
+0gIbDAUJCWYBgAAKCRCVS4UrsShbdWhPD/96+OIFTu+Y1j4VTGERHESmC3w8ZN1P
+4PmfFyNO3JICeXwHkw2sfcHsnsKCstni0q//a3Z1nTZbnCGb02/6wN//FGXlcaA6
+gJSWj/Di30hlyO3CDIj/3HxCfsAl6o1fiPL20wxaRRoYPFFbv+bfQQVeoc92NGsu
+2nE1tQ60aTuuM+3ZNTWW6PreCW3WdA9QgKA247Sp0jTXbZiIpjXH4byC3EHBHPjG
+FYQrDedfm88EddWDhCJk16SmrD9B40h0PS1NPTk745fwZp2yfzx6tEcQoHa7SX5E
+mvZ18HkdzWVUmGPsYK+CJ6ZJDO4YI4hFZ+1zUPsFYYA6mSHgNnFUa8d/HrFLjU+b
+FrcOIUhFyw+twISmq97QABbh+045/mqLMop692EBUc5JrwcqeizGs32Pmjb3glUk
+kF9M7ssQd33oqwmJYReILIvo9SR4zf8jlNgpM5C0lCwyAIwUZ7fD1lpS8GmjR9bs
+LOIEvvO9m+ty1jwkpUv0sNjgLD4XYEM3xJDaevfI7LZTG0yjmkdlMJvk5Oh2kGs8
+9W9xdPehFQnIao52Rp43cDgNx8h86QoKOLdgddn8d6X18tG7oR79MufjW9+JOHz4
+4OU6H/qCq81zdxmPRdla7+eoyjNatXHlHvTx6HUkbjo1/MBoHQDeCiR3z7yyXq1Q
+jN7Z51AB9/Ip1Q==
+=gZDk
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>