diff --git a/share/pgpkeys/tcberner.key b/share/pgpkeys/tcberner.key
index 8d50547da0..fe37fc4254 100644
--- a/share/pgpkeys/tcberner.key
+++ b/share/pgpkeys/tcberner.key
@@ -1,43 +1,75 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh tcberner D9F7782DF21AACEF ;
+sh addkey.sh tcberner 021DB73A50293AD0 ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   2048R/D9F7782DF21AACEF 2016-07-08 [verfällt: 2019-07-08]
-  Schl.-Fingerabdruck = CF7E 1348 3DC0 BC6B D9A3  B024 D9F7 782D F21A ACEF
-uid                          Tobias C. Berner <tcberner@FreeBSD.org>
-sub   2048R/33BC79B02F9E7F57 2016-07-08 [verfällt: 2019-07-08]
+pub   rsa2048/021DB73A50293AD0 2017-09-08 [SC] [verfällt: 2019-09-08]
+  Schl.-Fingerabdruck = BA58 38E2 61D1 A3C8 0960  C50B 021D B73A 5029 3AD0
+uid                            Tobias Christian Berner <tcberner@FreeBSD.org>
+uid                            Tobias Christian Berner <tcberner@gmail.com>
+sub   rsa2048/F06E731A05C1E357 2017-09-08 [E] [verfällt: 2019-09-08]
 
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQENBFd/5csBCADptTkRi2o/Zb4OMk5jmYvXKe1GaiFcYtXb0UJ2Y16ENohsyfqK
-swXs7KyiHaX9eFqAXZSkMcBKxYVrtzcUAaSR9Zfs8Cd1hq8+S3uCUC2/Dj+2TLyu
-z4ewjnYyPSWbu/ccaexAKxWjiLJryJJqWZ4igCEh+jSscouTGBHYlIONspad1yWM
-UORXC3dRrpsWs9XZziQiomx/aMF/Z2PpdPKVo8ZVyyu9j/FHmngjee3PRMQmypDA
-1K7Cc2O9nrALawr8dW6QjpU2ZJfdUlLNQy1RIDPnPMu2lNibAYOYcA1GBkYL2yR2
-2cdeD/xL06mDC64W/lLYxshQ60q4pwUXYt5ZABEBAAG0J1RvYmlhcyBDLiBCZXJu
-ZXIgPHRjYmVybmVyQEZyZWVCU0Qub3JnPokBPQQTAQoAJwUCV3/lywIbAwUJBaOa
-gAULCQgHAwUVCgkICwUWAwIBAAIeAQIXgAAKCRDZ93gt8hqs7wUtCADHy0W1YOxw
-t5LuCNa3NMdxhef7iveabi7B4BIOuRBfqeAttMc/ByWM3orSA9jk9ebrWOq8LQsu
-U1yM/dHdfookXMKwTm1xKWhTclMoEQwTte9cQkDjrOapUNp8u/2RG1D0OxrdBiYB
-Py6nhasZfEN/JzmXfQfBX4gVosSUDUWnP9dyzGamz6REyv+mol26kdMfZ5aRfMxK
-pHnzo5P9gJdTUuYZhj/rb3VAxOKYJFmJLwNJszT/Ue/ShwyV6rlEvJuEHeOITjpx
-w7uzI5oO23GW3vEte3KrDcaNJ5RAAE/ew4Ka8BUXKqeuaLtHYJPvaZ/7ueqyO4r3
-Shde7A14bQHNuQENBFd/5csBCAC46iyn2K3DnsKt+OMpt8YWFJfwKOqMSVJNuO9J
-zCPkeJjq3xc7wLpRhmZOhIWbWNzk2OUUmA+okdgHKqhScAm+juyyW5bClK7FLzdf
-sQG1v3nHZaHRAqb3K8V6vyEvZwxnrsxNEYESp07sqJtwFG2MRLR3ehrm8WgcFRhk
-I/wBoYXo5pCvtGeKDXV07eJPEezNkIeFwDpvP/o7Up+ISvgftu3U6stzyUBKf2Op
-nbmgbe9V6GKPvFV3wZPIOl5imk9xhlh62G7tg84SuegKTjPdaS1QaWU6upwtQhnz
-LqyWbsMqsYmgRgrrEkkCOJ6FSnGv1MqQ5fhOg1FUaGQjql/9ABEBAAGJASUEGAEK
-AA8FAld/5csCGwwFCQWjmoAACgkQ2fd4LfIarO8DOggA2IFP0KCUvutvQFL5QG+Q
-7cxVVTrh/6BWw6MWAGb9o80Gxs0EIVr3SGq3yOE54N42qVinalpsCgTweGAYgMHl
-Z+lWHGji7mko0H3kv3ps9aarL+ZYEbgit5Td0Y9cdFAcWTzce9u1whpCXx11kfj3
-CEIAAoVkqEmCBqEtjKXNNI1H1P3EGDRvdli8wzKJ8Vv8yTRYCmvSfFV/zBZlGZ0K
-dq+E02ZaCEJ1z71djlk+Il4lF2lsvbTejylQHSSG4GHjJwXQus5YB+lcwq/WBrRZ
-TDx+Js0J6HeU0XpF0it8+Qc2XpXx4wEz360jZUdEs7SML3DvLLA7llXQ8c5r0+Eg
-uQ==
-=4kdQ
+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
+=Kv19
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>