diff --git a/share/pgpkeys/dteske.key b/share/pgpkeys/dteske.key
index cf67fac273..33190c9377 100644
--- a/share/pgpkeys/dteske.key
+++ b/share/pgpkeys/dteske.key
@@ -1,42 +1,43 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh dteske AACC9F947D9E9AB9;
+sh addkey.sh dteske 0930FAC9E5C7A63B ;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
-pub   2048R/0xAACC9F947D9E9AB9 2013-11-01 [expires: 2014-11-01]
-      Key fingerprint = E052 3882 1097 ABB9 A537 ED2F AACC 9F94 7D9E 9AB92
-uid                 [ultimate] Devin Teske (FreeBSD Committer) <dteske@FreeBSD.org>
-sub   2048R/0xB29F871CBC396837 2013-11-01 [expires: 2014-11-01]
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   rsa2048/0930FAC9E5C7A63B 2018-07-06 [SC] [expires: 2021-07-05]
+      Key fingerprint = D5D1 66F2 805C A20E 35BF  E5F7 0930 FAC9 E5C7 A63B
+uid                            Devin Teske <dteske@FreeBSD.org>
+sub   rsa2048/E2AC40AB090CD953 2018-07-06 [E] [expires: 2021-07-05]
+
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQENBFJzv1oBCADKd7XY1jwBUW57OZZn/FI4u4MNEZEjmpOd+oaW0UL/U+xvU1V3
-JPCSiTVYq53qMGL6yqQxcwEehEFj8AjFclZEDPHICqRyKOxKj/4LF0/1Hzj7X49Z
-9q2+hC+VL/E9xB8/cgtew5Qb4nA0mFnsMJTmUzUSFJrwg+hA4FpZmwRZIBfynVQE
-LVB06PhAAowlPAAEjBPV369suG6TEp94wm+qWAl13Ud8aQXXbRzu1bbo4gRflwe8
-MzN8X22PEvNI0skEdmYj7K9WtRU3xXLAIesLq4dIq0xxa4xwv7VPujYDmLP/3OkE
-dvdTcrobpHVI7WngvgrGC5PcSVWSlQ0pWz6dABEBAAG0NERldmluIFRlc2tlIChG
-cmVlQlNEIENvbW1pdHRlcikgPGR0ZXNrZUBGcmVlQlNELm9yZz6JAT0EEwEKACcF
-AlJzv1oCGwMFCQHhM4AFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQqsyflH2e
-mrl12gf/XlyOQnFBIexle2+UxtIfgViFdrfen0OWg5oN33yGOCTtClVbwiW5GsQc
-kB1CYbtpJubdL8l+/mEGeXKjMRTsP06b9fAUbwTr4eKtD5ZvV3n01Mt7j3yFs8qh
-OZeWUG82zK3oKksWcQQFxoU2XyQE8lt5OggR+UYLP35qakff2KGpoZfYpl6Qblh8
-umOdxVGaz9puNrwgh/X2iPcjOJmNgU29O+aDY+7yg7PfMvtO0SnUPBjUw6m2GFf6
-121VT8eIwSNm41yjIWZmo53qYO8xa6uSJAw5Y2UmaYtizutXJWk5MgWBqWvmL9vp
-Gyp9WcfzZIB27AMhp2yW5Y1FQK/JV7kBDQRSc79aAQgArCysBtgikOD+3e/6rJV1
-Wb1kGka7CbGoqp4jatZ1StUHI2LKu5jj0h32TFbUqttAfUKiMPXAaA0KVuSv3TaE
-LD39UsSAUqXKzCi+Xbsk1T7YfHDPfdgElj5mMXZ3yGPAFOKnK17Rv6v5Eiv361lE
-DRs5fpn8CAX6QfAnizJ4YyA5LDmbfuxObVeFZKjXBcCERN4cqsMmUwrZPi2BEqt6
-t8hnB9GOiQvqLDiK220zVmGbqu1HL00jWko0gtkGZiOL1a0FLxdsoqza8n9L4WY5
-rMBa6wNeRBx0j0y0madX443+X/leM8B6cv40rW8on4RHwrJREnGAOPRNBajG7sNS
-VwARAQABiQElBBgBCgAPBQJSc79aAhsMBQkB4TOAAAoJEKrMn5R9npq565oH/3a9
-4plv0XZAS0+AW73e5y1uANWPS4zDCCCGW7fYIA0DdXVCmblpmw1s6tiS8DtQ7WYm
-mR8BeVqaxslP4buJMd5ZiKgG1R+xEYI4P1Ch3jg04hYCqvpzx8eVhHfM850HEs3L
-fUMQ0vtyDCqo6lV4yO9s8iDLY0dR7eyIWeAivLa9TQLygDYCJIIo4NJ59TzzxqDP
-QZb/00F010vXHH3A1KiduGhokwUpC2RB29ScQ/skmAV0Qu7QnVLlxWIcBkhxk2jZ
-RTPM1oax83zopfS9JUuDoJrqK17T3fWlf2uZFI4pgstOoFPVu4MudzfTZajLr4Rj
-Yo4zDFcwdMnYfOqfWHY=
-=6Oj5
+mQENBFs/JwwBCADXqKsPpUEGnHxmOIv2uRweY0mp9dVwjy7VM34sckghaxGRJUfk
+W82JJGHVxUT2Jxy0oYZEB+bTvk4HJP349ZMu9hTqJa/KQdOrUfyg9cjPf6V9XVZy
+kk1zM/ZHAfpX+LQRFUFNBrA6lgGg0FoPx2Oi7HR4+WDDyjYvrQMg9bXsGeD9gJt1
+th3gN1PL24BjoXmwMDlFpLuDXFiGicoft/717ZcJnrqrmdstO1hJCkuBK1sMjr88
+kzMeC+Y7rFO0A3db0TNZK66Lm7sxH27KYQN0YE+ihhQF6DxvQAI/BMgttYP6UiaL
+jW2+dH3rtjdSOPtgKkh8D2z9xrRL8hFcOKcZABEBAAG0IERldmluIFRlc2tlIDxk
+dGVza2VARnJlZUJTRC5vcmc+iQFUBBMBCAA+FiEE1dFm8oBcog41v+X3CTD6yeXH
+pjsFAls/JwwCGwMFCQWjmoAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQCTD6
+yeXHpjtOswf/e6iGDS81+Ucma9QuelkUltrGq0nkEOS5/8Luad0ybvjXqwE8IJJN
+8m/48Y1BjXk6gFSJvzuu13HgOb0N1ncrmJdILm+b8awAUm94dDhRQBy8mXFDQs9j
+c7OpGgNPeS4VEl+nyYQtnvjAei+KFZBe4EaYw7eo7RSnPJY9vHT25VI3kxdrNE1W
+JKJWoY2DJwWrFXuf1sj8r0dBGxZ1rpLs7nIZ0Dheon829hGVjntbMuU3YP6cA97T
+jnZxmADJ3f/yoq/CrQQgInSI4+7cx7U2xTsogJKjZdz7gIs8jvSdRpGxyJ+92ev2
+vYUL5f5voElXiWsUZ6gCfaWunGUGSVnl57kBDQRbPycMAQgAteeWvu9F2IXcXBr2
+oLo2bPO6IeENieeVCb6jgmaEbclpuvSEM/G1KMWSnn5VzlWEkN/9RXn9+qDfR5sf
+JDegCCnsUi5xeiUdV7EbAgD9/GIumPNWIX9BWv3R7Xz2H8VcH6+mwHhk0Kll5Qqh
+sTc+eVT9MAJAt4lK0xVzlZY9DHNDSCTxCu7miKyCBShvrT9maq4r6oNFiEQgYv81
+r2v9PQjXIrE2DAy4nLVXu6qXz5822TeMHAyPYKP1uHBadwkjP1WRjJf+8+uIT06V
+T7Y4m73cAPoOgQiGnPMGo52yXpnwDo51epulkUHWiA7tGeOHR+0m3QPkL8wiLCg7
+KN0WfQARAQABiQE8BBgBCAAmFiEE1dFm8oBcog41v+X3CTD6yeXHpjsFAls/JwwC
+GwwFCQWjmoAACgkQCTD6yeXHpju5qAgA01gmqtuZ90xIsKfSdwDQNgAmEMxSl5KF
+rvwFZsyGGwHClFTm/bal9+Lfl3C8MWsd8Um6N8XfqC2OmQl1jKX2fSNjQTQexs/r
+KmOnPmSXrEUwy3hIym8u+cJqXHMmfZU2AzX/n99ziw9N/Ir+FfxoM76qIvaZKAMG
+ok5bN3NpaIqHcRfpaklCTAwS1tWNOH3l09XB9dA8tGVGPn07ux8/vMXkcNDAPuhz
+3HKG/CN/i6lgxu4CwhlfKUYpKo6Y+ywNV0kK9bJWoSO6IFSisawjcLqVn8n60tWF
+pezptkqVZZm/NyPJxly227ejkITtPmHO/JSnU1dCu+Hs+Jvv0P+/Cg==
+=r9EJ
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>