Index: head/share/pgpkeys/rgrimes.key
===================================================================
--- head/share/pgpkeys/rgrimes.key	(revision 54032)
+++ head/share/pgpkeys/rgrimes.key	(revision 54033)
@@ -1,49 +1,43 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh rgrimes 43F7E894A04D94E3 ;
+sh addkey.sh rgrimes 3B47000B713CCCC9 ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   rsa2048/43F7E894A04D94E3 2016-06-19 [SC] [expires: 2019-06-19]
-      Key fingerprint = 94B8 EF61 1B71 4E5B F876  4421 43F7 E894 A04D 94E3
+pub   rsa2048/3B47000B713CCCC9 2020-03-30 [SC] [expires: 2023-03-30]
+      Key fingerprint = B304 BC67 09E8 E1C0 B97A  81CD 3B47 000B 713C CCC9
 uid                            Rodney W. Grimes <rgrimes@FreeBSD.org>
-sub   rsa2048/DF31FC64EB2C05B7 2016-06-19 [E] [expires: 2019-06-19]
+sub   rsa2048/20FC85916CAD63A1 2020-03-30 [E] [expires: 2023-03-30]
 
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-fUAT
-=OXQC
+mQENBF6Bx6ABCAChxFOSOLi0R4ZlT5JkagqHw3dVltYyy7NiZE01CUNXolBRzTrp
+jNVvguarmmlwUMYYTzR6TcKGs78AZOzF/uaegh52Xzx9ErRVw7COPs6etp3/iIHp
+hbhQRaMzBtr1+b34Yodo6ZnuaelXD5yuJUp5X8O54ry6TOL1DehLa42Hyn8ex0S7
+GnzOA1+U1sN6xNB86GsuohFmh0MJPw5WEH2d6gsmMwbtVMMR7qr0duHjSdWAKtH6
+RmVOvTrJ6kaaduvheVGUsrjtma0iT2UI/zAd9VLJ+t5R1gw4wsaLpZlt5M9Pz9ks
+Q10exCU60jPM9srPW49Om62qZAOoM6lEOcWzABEBAAG0JlJvZG5leSBXLiBHcmlt
+ZXMgPHJncmltZXNARnJlZUJTRC5vcmc+iQFUBBMBCAA+FiEEswS8Zwno4cC5eoHN
+O0cAC3E8zMkFAl6Bx6ACGwMFCQWjmoAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AA
+CgkQO0cAC3E8zMnvXAf/WtSg822KyHd6pjd1TEF4VWBTo1dmndCFiXC6aDSyFojU
+8kTcHO5IU8593Ict1o7ZAfJRY8q1TXG+7US8O/gVjcX+6idjfWzG6qcAc6VK/VKz
+8/iTlLHtzZ+pdmoNfPOxZBz23+l6lIbs7r8skO5pnQBRBpaSQ6zPrzuqhJaeIiKD
+xKz2gs7OoY1zDtcA3Z6T0CZ3UMXZ9FomYBOXkX5cUTEZSgQVgusb0/5erYvI/h5T
+mkKWIsw5GW9kX8C4QI+sQoOoUq7zKCmHEtOfX43WLK9FpQtU2YMTUE8kEOjrkY79
+qVC2XJY4mvF0EdkbVV4PeOI6SLpxilbaUIR1Vjp8xbkBDQRegcegAQgAt/Gwwgn7
+RDsSxj8HQ+4v9r5G7FHHtzyxexCr41wKUx1XEja1sF0j0kD+GKo1fVU7CVpoHdgw
+nwfutEx1NTBaoZSyDMvzuu27sW9ur6to9nGJNyagn8jC5wq6oRgV14h9QX8Z2WQE
+V2KQEvLPCssT/nBfSrx2mXrCyxurXv/JD8PVDA79+5/HMdsQN7lyQKkRQQLwVXVU
+qFJ08b6Tyma9SZKtn0NVVI726iJT5AOrC6bGNWNFODQdmzKR+jamfdOCdvp8M+UD
+/1TfW3JuXvQ8CxXYTEHnHn5cYNVhkhfY2v32Rx0ZASmw9lPoMwuZxYYTtqQ5CPNW
+hgfQ1s+vIoSnzwARAQABiQE8BBgBCAAmFiEEswS8Zwno4cC5eoHNO0cAC3E8zMkF
+Al6Bx6ACGwwFCQWjmoAACgkQO0cAC3E8zMngPQf7BBoMrYUQEPL7rQwg3AkE19O+
+Oa9kyl06/I2XlQf8gvWqRGcv6EZuZpGQmYB431B24Mp1T80IZs/+7Bblb7QSRUbF
+dIESK/Kf4amcZu3YYAsojLTAMNDjYoBcJ/DcerNvB1p5weeHKflkbMiUY2S6ht9H
+Mu3WiIDqbmDNFPSgjvmQNoCbSsJKWwroiUwaoCfW+UHcWMRZdLv7b7e1+jddDKiw
+FVm/rI2/m5a3v3tTIj10tDCS0GulKw+irmYrDB1UqwjpwPuUjg0YfCzrW/OQPFgB
+PHpCvC8a14rFsf9hs77Z+Vo9ahGzH/mP4IThA9BlX2IeIXO76JJYLBQ0MXt7XA==
+=5hhw
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>