diff --git a/share/pgpkeys/avg.key b/share/pgpkeys/avg.key
index 3155a84e9b..3bef46f025 100644
--- a/share/pgpkeys/avg.key
+++ b/share/pgpkeys/avg.key
@@ -5,6 +5,7 @@ sh addkey.sh avg A651FE2F;
 <programlisting role="pgpfingerprint"><![CDATA[
 pub   2048R/A651FE2F 2009-02-16
       Key fingerprint = F234 4D58 DEFF 5E3A 4E0F  13BC 74A5 2D27 A651 FE2F
+uid                  Andriy Gapon (FreeBSD) <avg@FreeBSD.org>
 uid                  Andriy Gapon (FreeBSD) <avg@freebsd.org>
 uid                  Andriy Gapon (FreeBSD) <avg@icyb.net.ua>
 sub   4096R/F9A4D312 2009-02-16
@@ -18,46 +19,54 @@ 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
-RnJlZUJTRCkgPGF2Z0BpY3liLm5ldC51YT6JATYEEwECACAFAkmZYl4CGwMGCwkI
-BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRB0pS0nplH+LxrvB/0R7uiYKZE63nqMbL2P
-9mqrbpC3PmrA0bNpfonu4wSOyvgeK/xJ0MTnSUTv5LLb1g+qF45LZSkYXsjncD+i
-HfLID68iSHBSWxQwgLePN1cEpDgcec/2YTpWBdzlC6Q4EtGunZs5jhEC9a4wDqBx
-uRzhexNDEiRzN0bZwqg/E2T7eY0oXfpwpdwsfAeuPniEwEJSFjSreMwg71wPIAb5
-HcuMieKnxjlqDEW7xQ0nrTydWnhxVvJoeVdB93mKnmhtQ9K/G6cV0q75Au5qy0au
-ztmXi8XaK/pyYxCbmhSPRC/u6Bo9K7rx6+MxtGX8YQd1VLC1kfNCx3JfETA8P1QE
-nJQstChBbmRyaXkgR2Fwb24gKEZyZWVCU0QpIDxhdmdAZnJlZWJzZC5vcmc+iQE5
-BBMBAgAjAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AFAkmZZdACGQEACgkQdKUt
-J6ZR/i9dkggAlly9aIHTmseVjpdHD67VZ3sZWPvb/QaZ905mOj6fhxb4MVlwl49o
-9VmO0Pd1Als5FziaDnRBGiB61MjqDiCNxRfn7K1LJ+hf52ax3o+4oWQ7pDWwNPfS
-4qdnqnwpZL3uL4EtaU6r4Ix5bz7ekoYUV88sORR0fYueJqxDJcom6ZnDKEG6RrCM
-mzuiXhDfEWdLD2mdMvKeTAd1hGK+dLrIy8hmjH3zn4POkXe+d4qIJ0ENG1rlXTST
-KdrIUPUjQSmS6W9fCrBF97C8ii384XbPUd/rQkDBLC3jcqGpuHhzGTLYza53dlvB
-4qk0CaXOd8cOu3i1ac5ldiMuAcmv/bqg6okBNgQTAQIAIAUCSZlhjAIbAwYLCQgH
-AwIEFQIIAwQWAgMBAh4BAheAAAoJEHSlLSemUf4v8+YIAKgxK/MtfJ+CpAc/HPR3
-JFy8jWEkFanKgYIClzydEb3ONHkhFzNIUJIdPHNq4NGpWT7sKJg7u/0ojjPuAI+y
-AniD632Ki6q2MGBZp7jVll4B3q3+wKvaTT+h+Q1UvNjOmTbTZaHifRP6ufBNjlQ4
-BoXFUpYYLGNcH8Zal5G3CcBWAsfXt0iAM5mLVVpJEzaQTDFCEKpeSInhiKYxGyFG
-dGcffr98sUZhLrdx2Pl5H1hD6G+DBRYZLXag7cEumPjuikrgxZNAeHEyz3QfhPFh
-l6YJKm7HBy3DNwrg57+jDBHx7AWviq87MzU1XnWWns5Fi1WLPSlyAKSGWMHqITfj
-7NqIRgQQEQIABgUCSZmGVgAKCRB8Pwz8BJPKAl0OAJ9OvtFwX62D5OfoZ+jwtRka
-qv1scgCeLrS4nYea2JBdVmDi9dS/d4LdOF25Ag0ESZlhwAEQANe1Q5ZfTOc+6I7S
-S7KBrbz+Rdo0iEg6or7rrKUC62Vm8aX97yzBsgXzwQXBjD64DiJ1Lely+RRdE1Rs
-77/b81WHOYYBExtrcNXmbwxWqSs7Vxf8yBd/uB9n24sf2KhbVFKOeGXiB+76Ls6Q
-F3cOmQeeyGR+Rk7Trk4O/UxUPnoGFTM7yuFjZnf5R2c2BfprUvZ1OdIax3BxqDAk
-TF1BvmdAYeTqf+45+2DY1qD5w0o5AcCOovOk0mj/3qUbFMngtaVgiEnQEUYpH8RK
-vFecaB13JAOjvcf8HppNtMiY/WC2vKeBI8XTVP4JB8h0agalQUabcXpMdA+J8Q5s
-0zFAueYfzfDOtjxjgoA3c7GKk8Hkj4rtaa1nbTgIGJ4of+gpuNSA+AmLOPrLAcSm
-xQWsayfvrMdCWIwjSkbqB4yAiffIdI11buH44XmU9VoB/EuyxZ0eWft61kBQIKtM
-ES+YMiEEEHb8R8I/2wgJx35hywHUlOKn163em8Rcwbm/i9Myx4pc9RVSsz9IBsUe
-bHOi3v0kfVrxLIwpqfUc/Ryla/+BW3W08WeJ5AW/hv+OU7HHnNTaBeNTX0MRe6Bx
-jbDYT+M0iizIU7itI8Ki/wDYhhbwKq+WLvozPHoHQv4rRnuwdvW8LQmdrIE21k+5
-XrphH1jIOMo3GosT2wEopaIbjC9dABEBAAGJAR8EGAECAAkFAkmZYcACGwwACgkQ
-dKUtJ6ZR/i8Gswf/WvKsYhmIPPzshU9e2LYXCNYSsoaayqcwpH4z2UzFOQ6GdOJq
-DaPYCvFS+gllkktfKJ+qXjvwMrJOyyONVIr34XJTKc+5dX2kKMu/CnSNkBD+nfDo
-tUk9Hd1Z5zGaNrPwy02y9KWqYASKIWNNFIttL0XEnMfW8CLWQrLzmKRlxWZPC1Lk
-TnYVtxH7RrM3VTbBBfyeMypbdj7Wc1/kEu4xqXgTI6FhXkgTR8Ag1LGP4x32rzBS
-QtuMayhOSUUQZrJpcQYQpSl3j/AGaXuC4sHRpgpomR3B98cCUwcJuQJtCK03W57U
-maATzhsOLAzTARzC9+OmDsItyFnveYUKQQEUwg==
-=4PiO
+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
+wg==
+=/KPo
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>