diff --git a/documentation/static/pgpkeys/brooks.key b/documentation/static/pgpkeys/brooks.key
index cf906e55a0..28b9253112 100644
--- a/documentation/static/pgpkeys/brooks.key
+++ b/documentation/static/pgpkeys/brooks.key
@@ -1,59 +1,54 @@
-// $FreeBSD: head/share/pgpkeys/brooks.key 54027 2020-03-31 21:22:23Z brooks $
-//
-// sh addkey.sh brooks ACD05DB49E6E07C0 ;
-
-
-[.literal-block-margin]
-....
-pub   2048R/ACD05DB49E6E07C0 2015-04-24 [expires: 2021-04-19]
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh brooks ACD05DB49E6E07C0 ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   2048R/ACD05DB49E6E07C0 2015-04-24 [expires: 2023-04-23]
       Key fingerprint = 4AD6 486F D9B2 A7B6 E086  3B1E ACD0 5DB4 9E6E 07C0
-uid                          Brooks Eugene Davis <brooks@one-eyed-alien.net>
 uid                          Brooks Eugene Davis <brooks@FreeBSD.org>
-sub   2048R/4055CD642D33B023 2015-04-24 [expires: 2021-04-19]
-
-....
+uid                          Brooks Eugene Davis <brooks@one-eyed-alien.net>
+sub   2048R/4055CD642D33B023 2015-04-24 [expires: 2023-04-23]
 
-[.literal-block-margin]
-....
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQENBFU6m7MBCACmo4fJVWY1b4jTgZ3IPDY15hMMbkGUEqA1VuNzLp4nFAQYZSh2
 lfLhAeOQlyaoItSlHI/B6yJIfBpCdjT8NIBv+K0Mpd1NQ0WXSFKuPHELZnCpGehe
 c3sdKU6gqOR0n35EJ+BpJ0RzxXwsK+r1XwE5kPeQoTDOJjEkGx/VQzqJ3kqTNJUP
 BjxfgC+4WKbNKiybhSr/bkYplXv4v3lOtZTxz3eJOnkRv3JIFfEzfiYYVjzutpmh
 GGTFfIXv7tBrQLACmxQpMB/Ijnw+XmSA5zUTNB1YCkxgjF3FV4Qcp6Z5++u6wqE+
-mXIQhu+AnTAt9tJ0mjG5IIbUrPV9fXj4p30nABEBAAG0KEJyb29rcyBFdWdlbmUg
-RGF2aXMgPGJyb29rc0BGcmVlQlNELm9yZz6JAT0EEwEKACcCGwMFCwkIBwMFFQoJ
-CAsFFgMCAQACHgECF4AFAlraCdUFCQtDCJEACgkQrNBdtJ5uB8D94QgAgZmJ5QXq
-TBLCorS74AVVu4JkonNKl9u9tPo8URVZXj9+QtW1F4WRv8kaf2eF2eJ8sizbwLV2
-1MFd28zTPjTC6MlMM6VC1C50++4tE0OCxXyDmqhef9KIxCJgE3pFF0WqyQF5D38y
-7dfXqqhMZZraDWqdvDNfJ8jHUV7CE9W7+QHtrKtAL55Pa9pNIY3IRldpbP9RW4QE
-ot7CVFl1YZvaa6k8RySLScirvDqGMC3Iz/ZWquold4EILCyHZbimNLI2qo5IpJtG
-HHJFHG0e5eoNjGbJBmaFqAwzO2swUlVZhoYyal7uZKY8SzsY6eIKeDsD9ryIQ65F
-LrOticgxcMp6J4hGBBARAgAGBQJVOp4YAAoJEF2Oi+nyOBrUYb8AnRZCE7j1xFBg
-Dw3vCzBWTyCv1admAJ0R/8+a5exxdsaAfgdPw8JRfw/ohbQvQnJvb2tzIEV1Z2Vu
-ZSBEYXZpcyA8YnJvb2tzQG9uZS1leWVkLWFsaWVuLm5ldD6JAT0EEwEKACcCGwMF
-CwkIBwMFFQoJCAsFFgMCAQACHgECF4AFAlraCdkFCQtDCJEACgkQrNBdtJ5uB8Cn
-QAf/W1u5R/gmOmXOUJOyHC0USCJz//J1WWFwVJtz7AlUgPSMNO9/dn9fWPB4HY4u
-IEsbDc8a3fe5JYOStq6NmY+oohsFlBq5Vly5lkl8N8PtRvKtQYZrm+FM9y/o0Prb
-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
+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
-03Cu9mqW2JewMemNohQVG2G51kda+wARAQABiQElBBgBCgAPAhsMBQJa2gntBQkL
-QwiyAAoJEKzQXbSebgfAYpEH/Au56D4u1e4muOBx/kQAWnakn+yBfJvWkhzWt3g8
-lkLQd+fZ3kMs8gPK8i5gOqYfQ3xuGI4yHPwcbS5H579jynT18Do9NB1dWxYPSoXb
-0XMN5VNXrmfxMemT5wmjxMytMSn8U3k+dfHASswbh+iF9BGmNmzCX2xN/t9xOaqS
-RsABkgqUnPRMSbLV45fkw66rV7cZIau3SzxOt9D4mSqkGBE7Ro5Hz47Z8TUnWG8D
-XkUtrSse+3hbJBdKO+bN65bknOrlmj3w4wY13gPu2RBDiBjvJE3E36Mp6DW3PilN
-offCCQ7Zdl0LByjIGFfgNSQGfrDN5gq5LD+XHHXRHq7wPBE=
-=RaOB
+03Cu9mqW2JewMemNohQVG2G51kda+wARAQABiQElBBgBCgAPAhsMBQJgg0jiBQkP
+CxQqAAoJEKzQXbSebgfAjAMIAJPNf6G673GiwN+YJlD/NMMV5C5btB1JMu2/vHer
+kUE8SiI+x1gkBcEE4v4S/BZvskxKYwm/LZH8se1O6bVxzemkOB1NL0/wkbk837al
+6eqHH2XjwMzTxKSv4eDiZq6IcDDjYl6WkA2eBAdaDwSk9M7JQpA7FSDGihdnsXQS
+YRatBPbPLRMt0zVPcLfQqyS9EpTbTJvzb/VM79LX7yLXzNS9eYSu1Mu2DJoUiw3G
+MY3+WpZguaS9rTe5HJNmOuGAmWU+mi4rER8r0sEsG8A9ktaQ0ydhNK3qMIbfDLJI
+eP0tgWklYsGJxeaVy5BPV5iF3/WrBmghNW8+HEvYP9I4lJE=
+=OfLT
 -----END PGP PUBLIC KEY BLOCK-----
-....
-
+]]></programlisting>