diff --git a/share/pgpkeys/tabthorpe.key b/share/pgpkeys/tabthorpe.key
index 44a2e36b18..48c19296a4 100644
--- a/share/pgpkeys/tabthorpe.key
+++ b/share/pgpkeys/tabthorpe.key
@@ -6,13 +6,13 @@ sh addkey.sh tabthorpe D069F2A0;
 pub   1024D/D069F2A0 2005-07-06
       Key fingerprint = 62EB 68F5 C1A4 8FCE 5A87  BE22 E469 BF8C D069 F2A0
 uid                  Thomas Abthorpe (FreeBSD Committer) <tabthorpe@FreeBSD.org>
-uid                  Thomas Abthorpe <tabthorpe@FreeBSD.org>
+uid                  Thomas Abthorpe <thomas@goodking.ca>
 uid                  Thomas Abthorpe <tabthorpe@gmail.com>
 uid                  Thomas Abthorpe <thomasa@tbaytel.net>
-uid                  Thomas Abthorpe <tabthorpe@stthomasanglican.org>
-uid                  Thomas Abthorpe <thomas@stthomasanglican.org>
+uid                  Thomas Abthorpe <tabthorpe@FreeBSD.org>
 uid                  Thomas Abthorpe <tabthorpe@goodking.ca>
-uid                  Thomas Abthorpe <thomas@goodking.ca>
+uid                  Thomas Abthorpe <thomas@stthomasanglican.org>
+uid                  Thomas Abthorpe <tabthorpe@stthomasanglican.org>
 sub   2048g/16752D82 2005-07-06
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
@@ -28,48 +28,94 @@ HG3PYogdrtKnd+38SLKl1qtdyVn8ve25rV3qUO1MqlO7daoYpKFEe4zKFSNu56RM
 VALoO8UeJd5UHHiVMGef78sqY00Ay56Jk6O3rQvxgPv0GO3iZ75UrCndotzZsJqe
 uYOfvmSGlDjdyCr9ttEU6I7NRLfegbSDIBKLH1tDx4tjgmAlrLQ7VGhvbWFzIEFi
 dGhvcnBlIChGcmVlQlNEIENvbW1pdHRlcikgPHRhYnRob3JwZUBGcmVlQlNELm9y
-Zz6IYAQTEQIAIAUCR6Im4QIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEORp
-v4zQafKghWQAn0mh+4JPEk01XhYfp0xowizJWwj5AJ91rbqAV9Y98oCDk5+xEOrg
-5PLSO7QnVGhvbWFzIEFidGhvcnBlIDx0YWJ0aG9ycGVARnJlZUJTRC5vcmc+iGAE
-ExECACAFAkc0yDcCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRDkab+M0Gny
-oLiFAJ4ti9aiWt4pFG5FOdlRAJyebdRZbgCeN76iojEpay/M6K21WQlOU47Oscm0
-JVRob21hcyBBYnRob3JwZSA8dGFidGhvcnBlQGdtYWlsLmNvbT6IYAQTEQIAIAUC
-RzTIGQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEORpv4zQafKgdWcAn3w4
-sSnM61bo8iJ+b+E+zmVjFleXAJ4q/1XG+Q1xwilc/FCvVtTveM9grLQlVGhvbWFz
-IEFidGhvcnBlIDx0aG9tYXNhQHRiYXl0ZWwubmV0PohgBBMRAgAgBQJGuSP4AhsD
-BgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ5Gm/jNBp8qCruACfTnIPAG5u90p1
-5gmJOQH2jHN31iIAnRfdwkMTxRAfnM67jyqqFS/kFGZRtDBUaG9tYXMgQWJ0aG9y
-cGUgPHRhYnRob3JwZUBzdHRob21hc2FuZ2xpY2FuLm9yZz6IYAQTEQIAIAUCRrkj
-0QIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEORpv4zQafKgqUEAn0hS6bXd
-GyGjuMzh+y5tjxfiWJpIAJ94Z2V4ADOHh0xRA30WI8QEey7J5rQtVGhvbWFzIEFi
-dGhvcnBlIDx0aG9tYXNAc3R0aG9tYXNhbmdsaWNhbi5vcmc+iGAEExECACAFAkWd
-OV8CGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRDkab+M0GnyoMILAJ9kmeKG
-p7urxNt30FzdJgxb6avWmgCePcu0exog2kn8zZzri+f0UT2i2i+0J1Rob21hcyBB
-YnRob3JwZSA8dGFidGhvcnBlQGdvb2RraW5nLmNhPohgBBMRAgAgBQJFnTkcAhsD
-BgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ5Gm/jNBp8qCmKQCdF0Kyo2cVcIp6
-uLiFuyzJT/zP5CUAmwYxG9hTClBtyXoHB0jakY7BtBsAtCRUaG9tYXMgQWJ0aG9y
-cGUgPHRob21hc0Bnb29ka2luZy5jYT6IXgQTEQIAHgUCQsvqCwIbAwYLCQgHAwID
+Zz6IYwQTEQIAIwIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheABQJJLrP/AhkBAAoJ
+EORpv4zQafKgXoMAnj080JNa2mxb2M8UIIm0VjdRLuOcAJ9yYMImNL32GvY974BI
+TrM/hGm3wIhgBBMRAgAgBQJHoibhAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AA
+CgkQ5Gm/jNBp8qCFZACfSaH7gk8STTVeFh+nTGjCLMlbCPkAn3WtuoBX1j3ygIOT
+n7EQ6uDk8tI7tCRUaG9tYXMgQWJ0aG9ycGUgPHRob21hc0Bnb29ka2luZy5jYT6I
+RgQQEQIABgUCRx7XLQAKCRDkmPwryDXUDqRuAKDD8iHlgMRGvCqf+UmCHSe1Kxn3
+FgCdGqt1S56Un4+A0Pn/CwztKjU0j4mIXgQTEQIAHgUCQsvqCwIbAwYLCQgHAwID
 FQIDAxYCAQIeAQIXgAAKCRDkab+M0GnyoEfuAJ0aM3RzuyYugQMOIHRSJKxp7pwu
-zACeINi9MHxpn5Z/iar30wYUk5AufkqIYAQTEQIAIAUCRso1sgIbAwYLCQgHAwIE
-FQIIAwQWAgMBAh4BAheAAAoJEORpv4zQafKgLXgAn3s28ZTCsnfSuwI/65d6E5rE
-EWLmAJ9YjAEvMaio9Hexbt29U8o8RYv2rohgBBMRAgAgBQJGuSQPAhsDBgsJCAcD
+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
-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
-+B++XQFFlNE=
-=3KG1
+nWcktaQAmwTkl8F0/lctqL5EkuTruOs6ckz6iGAEExECACAFAkbKNbICGwMGCwkI
+BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRDkab+M0GnyoC14AJ97NvGUwrJ30rsCP+uX
+ehOaxBFi5gCfWIwBLzGoqPR3sW7dvVPKPEWL9q6JASIEEAECAAwFAke23aIFAwAS
+dQAACgkQlxC4m8pXrXz/HAf8DdrePRybntKRLR9XJsr77dDhX7dly66uaVFWS6AC
+Ahv4Mu2iy7UxEZNwngiLXrbb2brsIw+iYZ110XznWWvjVpHCMuNDYD06qwQGIqAf
+a1znY77/pMjyMuqWedV2abl6bqDncm+5THpFa6E5wcIWx6s9iJBxx99sBAOwbB5U
+mTgxJ7x4MmAIFHVKOfltHNaeXYybYeA2jLBVyBjDZMM5/4F0QI8YtuLJQ+w/907L
+OAu1oMM+K9egaTBkwLsb2iyTri5lMza8RjagaPkr/VhYavmz3kPAXdrdcgw1Z8vV
+zqgpscjg868pSBwUMz6XQbrqdRz1he8uNEj6GlgHfSs2K4kBIgQQAQIADAUCSIzJ
+KgUDABJ1AAAKCRCXELibyletfG/+B/0VMzACnushdW3oMt36AxgCwHF7DijVoFu6
+j7sbQPiKMdFdH0vLRCFOArnscxVCWovzWd6GFd4xhaLK9sNG59fHGL4jsnE3o/dU
+PYGg7Cf47R4pf5eFTawd3yyRARKm0IF1V2CtbLolkJ7pbvkHqZWQv6sRSkZbAngN
+IwExzQdE0Z17hr8fpLcAMSSBkoah+pII/Le3XCQOS9Ji/tBCkSwKvkyYKerJQ2Wy
+UHe1DqJbbS8mlp4bCvc4c613+S2WO/cfiktpqxdD+ZaU6dqGo4tlSRN51JLVsas7
+BszKBQbfEU96zuydctcvzw0woNLMgEJMZJmETKSCKeKfjn4OwTKQiQEiBBABAgAM
+BQJInY/EBQMAEnUAAAoJEJcQuJvKV618gVQH/16oQ5uXuC8XZ65G6dZnSFZ3G0za
+vGEZL/jiI8Wngym8F7UR8mjQPbJJsJcJ6lm81dR4UKinG2XF3wRuU86XeU4Ld6jt
+PiV3pMYNriiQKHYlFAZvjxEtDJkB/9dwN/TcQomNj0MZs7QBMKXzVY21UTMPaqCj
+eEO9f2iSqDgbE4K/1x6kqvTfNEd+sA73tEPEPgcOE8nWxDIYk/Xl2HQnJ84L72+P
+GrK1Y+odFQ5p2Kw800btrzOw2NoLd+6qCOBYuI9mXNyEjnWQqKNb/00CYHY8p5q7
+WkzqF3YEvDOIj5WE0jub1Rib/34awk3si5CB5UBMuZ9ef7ERoJEdEs6fxwe0JVRo
+b21hcyBBYnRob3JwZSA8dGFidGhvcnBlQGdtYWlsLmNvbT6IYAQTEQIAIAUCRzTI
+GQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEORpv4zQafKgdWcAn3w4sSnM
+61bo8iJ+b+E+zmVjFleXAJ4q/1XG+Q1xwilc/FCvVtTveM9grLQlVGhvbWFzIEFi
+dGhvcnBlIDx0aG9tYXNhQHRiYXl0ZWwubmV0PohGBBARAgAGBQJHHtctAAoJEOSY
+/CvINdQO0SYAn2S56W0WXCj0vGS0afl12pl1h772AKCgNaKyuWu0eHdH9Wk6jCqJ
+tVgqBYhgBBMRAgAgBQJGuSP4AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ
+5Gm/jNBp8qCruACfTnIPAG5u90p15gmJOQH2jHN31iIAnRfdwkMTxRAfnM67jyqq
+FS/kFGZRtCdUaG9tYXMgQWJ0aG9ycGUgPHRhYnRob3JwZUBGcmVlQlNELm9yZz6I
+YAQTEQIAIAUCRzTINwIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEORpv4zQ
+afKguIUAni2L1qJa3ikUbkU52VEAnJ5t1FluAJ43vqKiMSlrL8zorbVZCU5Tjs6x
+ybQnVGhvbWFzIEFidGhvcnBlIDx0YWJ0aG9ycGVAZ29vZGtpbmcuY2E+iEYEEBEC
+AAYFAkce1y0ACgkQ5Jj8K8g11A52ngCgvhSJxD7X6wmIbtlnrKG2VHI6sQwAoMCf
+jEIywruJ3/7Kbq56RdJYzFaFiGAEExECACAFAkWdORwCGwMGCwkIBwMCBBUCCAME
+FgIDAQIeAQIXgAAKCRDkab+M0GnyoKYpAJ0XQrKjZxVwinq4uIW7LMlP/M/kJQCb
+BjEb2FMKUG3JegcHSNqRjsG0GwCJASIEEAECAAwFAke23aIFAwASdQAACgkQlxC4
+m8pXrXwwAAf+ITFc1i+ag6DUWh+i/mR62YlVI42fgS4/dyQ8ZnuT4+f/I+y4hoUL
+q5+sytlU2b3xLZUz1wVX9ubXlDU4ijSvtSxoSsIpCfbVVWt+dmiUUZ2hApHVC+X1
+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
+DJze1jo7nwtF4D34H75dAUWU0Q==
+=Bijf
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>