diff --git a/share/pgpkeys/tabthorpe.key b/share/pgpkeys/tabthorpe.key
index 58604db251..44a2e36b18 100644
--- a/share/pgpkeys/tabthorpe.key
+++ b/share/pgpkeys/tabthorpe.key
@@ -1,69 +1,75 @@
 <!-- $FreeBSD$ -->
 <!--
-sh /disk1/doc/share/pgpkeys/addkey.sh tabthorpe D069F2A0;
+sh addkey.sh tabthorpe D069F2A0;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
 pub   1024D/D069F2A0 2005-07-06
       Key fingerprint = 62EB 68F5 C1A4 8FCE 5A87  BE22 E469 BF8C D069 F2A0
-uid                  Thomas Abthorpe <thomas@goodking.ca>
-uid                  Thomas Abthorpe (FreeBSD Ports Committer) <tabthorpe@FreeBSD.org>
+uid                  Thomas Abthorpe (FreeBSD Committer) <tabthorpe@FreeBSD.org>
+uid                  Thomas Abthorpe <tabthorpe@FreeBSD.org>
+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@goodking.ca>
 uid                  Thomas Abthorpe <thomas@goodking.ca>
 sub   2048g/16752D82 2005-07-06
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBELL6gsRBAD6ahgX4ShNoBnFlwzDGSznhJPNGBDmR5nWwzS3W+76bHf5INnb
 wU3EKazu3nUPpMkoCzt05K/1nI+WvDa2l5qdGJHXghbJTaTzRAvQL5tUcQyaQS2A
 PGGlk5xvQXowMMI4BTeUspr4/FXD4ApvA3WJDDa5E/yRH5DsJZhbt8uo6wCghzcO
 F89BOjIk9sunQkG+UZenTzUD/i7PIKkiQybeNdBeJJLYV5+yceHmSN/9tKZzjBKQ
 HG3PYogdrtKnd+38SLKl1qtdyVn8ve25rV3qUO1MqlO7daoYpKFEe4zKFSNu56RM
 0w59cuOfqR0f8N213T3qp4ZLaSh/ZI2+wDVDra0/YuJm2vs2s7wYZuoFhX9v22vl
 03TOBACsyqxIFSw02jbi5wkxR82oUvgJXFwRG51G8SWRE0TxuHIiJkyWfHPz5YXn
 VALoO8UeJd5UHHiVMGef78sqY00Ay56Jk6O3rQvxgPv0GO3iZ75UrCndotzZsJqe
-uYOfvmSGlDjdyCr9ttEU6I7NRLfegbSDIBKLH1tDx4tjgmAlrLRBVGhvbWFzIEFi
-dGhvcnBlIChGcmVlQlNEIFBvcnRzIENvbW1pdHRlcikgPHRhYnRob3JwZUBGcmVl
-QlNELm9yZz6IYAQTEQIAIAUCRso1hgIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheA
-AAoJEORpv4zQafKgzscAn34Hn7pXzy6I6yH5LJk5AzKPOWr3AJ0anvtz4le0+d+3
-8pqxgzc0LIez8rQlVGhvbWFzIEFidGhvcnBlIDx0aG9tYXNhQHRiYXl0ZWwubmV0
-PohgBBMRAgAgBQJGuSP4AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ5Gm/
-jNBp8qCruACfTnIPAG5u90p15gmJOQH2jHN31iIAnRfdwkMTxRAfnM67jyqqFS/k
-FGZRtDBUaG9tYXMgQWJ0aG9ycGUgPHRhYnRob3JwZUBzdHRob21hc2FuZ2xpY2Fu
-Lm9yZz6IYAQTEQIAIAUCRrkj0QIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJ
-EORpv4zQafKgqUEAn0hS6bXdGyGjuMzh+y5tjxfiWJpIAJ94Z2V4ADOHh0xRA30W
-I8QEey7J5rQtVGhvbWFzIEFidGhvcnBlIDx0aG9tYXNAc3R0aG9tYXNhbmdsaWNh
-bi5vcmc+iGAEExECACAFAkWdOV8CGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
-CRDkab+M0GnyoMILAJ9kmeKGp7urxNt30FzdJgxb6avWmgCePcu0exog2kn8zZzr
-i+f0UT2i2i+0J1Rob21hcyBBYnRob3JwZSA8dGFidGhvcnBlQGdvb2RraW5nLmNh
-PohgBBMRAgAgBQJFnTkcAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ5Gm/
-jNBp8qCmKQCdF0Kyo2cVcIp6uLiFuyzJT/zP5CUAmwYxG9hTClBtyXoHB0jakY7B
-tBsAtCRUaG9tYXMgQWJ0aG9ycGUgPHRob21hc0Bnb29ka2luZy5jYT6IXgQTEQIA
-HgUCQsvqCwIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRDkab+M0GnyoEfuAJ0a
-M3RzuyYugQMOIHRSJKxp7pwuzACeINi9MHxpn5Z/iar30wYUk5AufkqIYAQTEQIA
-IAUCRrkkDwIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEORpv4zQafKgAAQA
-mgL6eGO3Vlbn+W9b2WXD651nJLWkAJsE5JfBdP5XLai+RJLk67jrOnJM+ohgBBMR
-AgAgBQJFnTofAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ5Gm/jNBp8qC2
-fQCffjgd3bSt5RaNwumtyj39l5HgaqsAnRzZeCeE3v1EX7IcvHhT1e66LLmjtCRU
-aG9tYXMgQWJ0aG9ycGUgPHRob21hc0Bnb29ka2luZy5jYT6IYAQTEQIAIAUCRso1
-sgIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEORpv4zQafKgLXgAn3s28ZTC
-snfSuwI/65d6E5rEEWLmAJ9YjAEvMaio9Hexbt29U8o8RYv2rrkCDQRCy+o+EAgA
-n8BQcPust0IZTGSb+Nwj9T9wRlVoa31bjstnPhXx/GWlfZe0VDlc6w0veB2HGoz9
-WJkIbIOkc2ZzxnHB0knObxF1fcuplwMuPz0XK2CBJRrExI3gEJ+ao/TvBmMk5uZx
-VIZ7yP1mzkCF5y8M8AkxxRTFfZ4H3SUAwxlCr7Jx1M4LvLjcKbKfy+ro/nkPoO5z
-5fY9eLsF67aiAtgX2IvnFZEP8BUwlO3f+DeBM/3UlHl5A+XAZ6IUw+fdGfljlSzE
-Ej3RoKcU1O2eRa2XkVWd7ZIXH0iQDYfr+vN9YhfL+zSfvEeLsMzzAu9HNSNAHF9h
-QEPodMo6csY6e0xUecurywADBQgAnB1TOsQpvmryF9qHUHUviGaJJaMm0PQPbvGr
-gu80SCUfOPnttjdd7+KtY3uM4rbYvFXnMl9cHyGaOlRtJZj42TIpa8iH5dEQXB3S
-+jv2ii/x55PC7z/klLmtyC2u669WOd2bqlXk3eVgklFQ5yDZsds6RCPDuADYBrl/
-08cnhFzEaO2OcsewN1yyd5crj1QxIepx7h6YRJZV4fCKELKfInMLguEpRrQB9V4R
-oBXzosIvebPW87X75nPAuH+YtzticH7uMrG6VITM3vkv8aS/sE02uMDZKQh8gjan
-ZGBtEB/xhXaBJIGabMhQWcM5CbcdshHG13gx8W8DNafN2bCA9IhJBBgRAgAJBQJC
-y+o+AhsMAAoJEORpv4zQafKgEUgAn3uI606CD/ws/V8PCt2/EnB548tBAJ9YDJze
-1jo7nwtF4D34H75dAUWU0Q==
-=taJ2
+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
+FQIDAxYCAQIeAQIXgAAKCRDkab+M0GnyoEfuAJ0aM3RzuyYugQMOIHRSJKxp7pwu
+zACeINi9MHxpn5Z/iar30wYUk5AufkqIYAQTEQIAIAUCRso1sgIbAwYLCQgHAwIE
+FQIIAwQWAgMBAh4BAheAAAoJEORpv4zQafKgLXgAn3s28ZTCsnfSuwI/65d6E5rE
+EWLmAJ9YjAEvMaio9Hexbt29U8o8RYv2rohgBBMRAgAgBQJGuSQPAhsDBgsJCAcD
+AgQVAggDBBYCAwECHgECF4AACgkQ5Gm/jNBp8qAABACaAvp4Y7dWVuf5b1vZZcPr
+nWcktaQAmwTkl8F0/lctqL5EkuTruOs6ckz6iGAEExECACAFAkWdOh8CGwMGCwkI
+BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRDkab+M0GnyoLZ9AJ9+OB3dtK3lFo3C6a3K
+Pf2XkeBqqwCdHNl4J4Te/URfshy8eFPV7rosuaO5Ag0EQsvqPhAIAJ/AUHD7rLdC
+GUxkm/jcI/U/cEZVaGt9W47LZz4V8fxlpX2XtFQ5XOsNL3gdhxqM/ViZCGyDpHNm
+c8ZxwdJJzm8RdX3LqZcDLj89FytggSUaxMSN4BCfmqP07wZjJObmcVSGe8j9Zs5A
+hecvDPAJMcUUxX2eB90lAMMZQq+ycdTOC7y43Cmyn8vq6P55D6Duc+X2PXi7Beu2
+ogLYF9iL5xWRD/AVMJTt3/g3gTP91JR5eQPlwGeiFMPn3Rn5Y5UsxBI90aCnFNTt
+nkWtl5FVne2SFx9IkA2H6/rzfWIXy/s0n7xHi7DM8wLvRzUjQBxfYUBD6HTKOnLG
+OntMVHnLq8sAAwUIAJwdUzrEKb5q8hfah1B1L4hmiSWjJtD0D27xq4LvNEglHzj5
+7bY3Xe/irWN7jOK22LxV5zJfXB8hmjpUbSWY+NkyKWvIh+XREFwd0vo79oov8eeT
+wu8/5JS5rcgtruuvVjndm6pV5N3lYJJRUOcg2bHbOkQjw7gA2Aa5f9PHJ4RcxGjt
+jnLHsDdcsneXK49UMSHqce4emESWVeHwihCynyJzC4LhKUa0AfVeEaAV86LCL3mz
+1vO1++ZzwLh/mLc7YnB+7jKxulSEzN75L/Gkv7BNNrjA2SkIfII2p2RgbRAf8YV2
+gSSBmmzIUFnDOQm3HbIRxtd4MfFvAzWnzdmwgPSISQQYEQIACQUCQsvqPgIbDAAK
+CRDkab+M0GnyoBFIAJ97iOtOgg/8LP1fDwrdvxJweePLQQCfWAyc3tY6O58LReA9
++B++XQFFlNE=
+=3KG1
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>