Index: head/share/pgpkeys/garga.key
===================================================================
--- head/share/pgpkeys/garga.key	(revision 54197)
+++ head/share/pgpkeys/garga.key	(revision 54198)
@@ -1,62 +1,62 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh garga 6A5918C8F4222329 ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   rsa2048/6A5918C8F4222329 2020-06-03 [SC] [expires: 2023-06-03]
       Key fingerprint = 48B7 0638 B779 1114 9400  2749 6A59 18C8 F422 2329
-uid                            Renato Botelho (FreeBSD) <garga.bsd@gmail.com>
 uid                            Renato Botelho (FreeBSD) <garga@FreeBSD.org>
+uid                            Renato Botelho (FreeBSD) <garga.bsd@gmail.com>
 uid                            Renato Botelho (Personal) <rbgarga@gmail.com>
 sub   rsa2048/70F73941F80D196B 2020-06-03 [E] [expires: 2023-06-03]
 
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 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
-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
-Xp2joykgniXT2qbVUjXjGRc=
-=4qni
+sK7Lso4w0eQVVvVRntMeKZFXYITEmNN0oJK1ABEBAAG0LlJlbmF0byBCb3RlbGhv
+IChGcmVlQlNEKSA8Z2FyZ2EuYnNkQGdtYWlsLmNvbT6JAVQEEwEKAD4WIQRItwY4
+t3kRFJQAJ0lqWRjI9CIjKQUCXtfX3gIbAwUJBaOagAULCQgHAwUVCgkICwUWAwIB
+AAIeAQIXgAAKCRBqWRjI9CIjKfX5CAC52qagPH9l6a/uxS0j+645ohxehDQNmFEv
++gNSVI6UxjLWrZfeT4MAVYML2Oa0yO5YZbxL76OwoF/RZEUojAumuiKS/TbSEQ95
+BtRhsbkJy2gg2V6kcd2DusKtj6ifIoA82ZbExlK5QHDA3CYyQP6inqZl4pBzhRGT
+kPS6zOx3u9dSUy5W8033Tv8Sur6DP1O6ChiaztmOwJbMNzA/w5F0OafUc6pmVjwr
+t5Z2hZQDRvi5vGXhG9B77iBSuCaQVrQiuXRGtKeozCh3WfpiI6nos4gDRPSdH+1s
+QlgRNUXZ6C30VSAJqJ5j2zNqWF3mZImcXjY4+kgcj7vS9oTrMi2LtCxSZW5hdG8g
+Qm90ZWxobyAoRnJlZUJTRCkgPGdhcmdhQEZyZWVCU0Qub3JnPokBVwQTAQoAQQIb
+AwUJBaOagAULCQgHAwUVCgkICwUWAwIBAAIeAQIXgBYhBEi3Bji3eREUlAAnSWpZ
+GMj0IiMpBQJe19m1AhkBAAoJEGpZGMj0IiMpcQwH/2lYhZ+2OIX29X7k1XoluzrU
+nZatUo5/QCOcay5ltgc64fllqpOXKQzIZrm7z5PtltEOK7B5tjx23gM0B6FoTuzR
+JciYAneJdlj7hKTFLn/FaTWge2gJXuTJBOfHRU6EOAX6Kug4RpCs+bqIid8on8WN
+WE2g4vqnoXeoyCiM1nlbzcAm+z5WUCRFp53i6QsXtrV7xrtZ6BPZUQDRuBEYeVd+
+r8IvmBhS3y3RnSu6MO4KIb8ypBf6q+JeldBWseiW8SA7caP9OwJCp5ElrfzpL5+Q
+9d/du3pzNHYSayu5ufZm01me3ARiulrQQeTnAAu8hlmpJzAQd1eayOkH3CwU7uC0
+LVJlbmF0byBCb3RlbGhvIChQZXJzb25hbCkgPHJiZ2FyZ2FAZ21haWwuY29tPokB
+VAQTAQoAPhYhBEi3Bji3eREUlAAnSWpZGMj0IiMpBQJe19eyAhsDBQkFo5qABQsJ
+CAcDBRUKCQgLBRYDAgEAAh4BAheAAAoJEGpZGMj0IiMp1cwIAKRwgPjgh5nD3qfA
+r4D+NDNvQJ2UHdgAs/32P7oW5C5TBp+N5BAI1gY/+mnXYHZ4Ip04S9qcaeErfoek
+vkT3WR/llj42iFYICHhUlOVUYg3/m2/LX5DRjQOdnl4s79iOcxjmaBGuYvZPqVHW
+DWu9oZYmqWw6cuVGCS02xMSx3HJo16/g31CU2NRAaGIXoaCqOGHZK8lLIDFrR+jJ
+wAlhY+/RhWtT6MDNGRLY2Gwo9+3SJytQfzA9/alD2MgVGsB2W1ijI1YVc+DzODxb
+C2bzjbJLXPFlajbs4KI4lKXTwloj2ZzrH4k7QbCXGhylFsxgZO6HZLGlGhMnxu3g
+lTrIE7O5AQ0EXtfXVAEIALBASXMe55yvhadJXzp1jB1GrWIZrwsA1wOw+pjdluXk
+74qTL4jMf/4dXXUp7DBzdqZHGz264/19YZsLqCuMGBEfLcuMDrDI8NyQ44XV+41H
+7an92lbs1X/IfADRoGb/S0mYRVdguvjVoONdxJdegHy7Ca0n/3eBUuwp+1RC9/hv
+k2lXMlHeRb3nma3tUOXvT8WRgvyHFuzjztaaQhceFCjAvRFtForucQ78ro/dEfdz
+7JBB57dokyBwue3Nu8MZnuCQWGbt+Jtby0Mx3P2u198jL24Z+4VNBTL4wWdYcPxs
+EJX5+gM4mYRjwaTBfBypIEVlZKVT6Bw7Jv/AT97nOcUAEQEAAYkBPAQYAQoAJhYh
+BEi3Bji3eREUlAAnSWpZGMj0IiMpBQJe19dUAhsMBQkFo5qAAAoJEGpZGMj0IiMp
+ohAIAIejQ1Tsu6AiHubPyGrde+6c/ThQ5Yyu9ymz4jK1bauyZiUImeMl7kaSHm9E
+e1+lu5ZGjsGfpfLJDZ5yj0gxqPcsmKptpMC7/vrdiAM9I/J4J3AVOc3S1D2JagKd
+OuU51L0NlVTK+QMndokXBh68HueZhcDYWHvPNfBQM3k9Twb5jBmi34BGKJHf7F7p
+AesDvGRu4ZNVkE9ldc6lrGlMMi9rfDGsvJ6F8eB9UaunVSwrxTr/lX8s7Fdfs8Mg
+fAz/s/f+DyJJ92xhgX+xBjWj/F0+EUrJGLqDU1Cw6dva3tevNjuC0nagV4e66DVU
+gZl/Xp2joykgniXT2qbVUjXjGRc=
+=TFvG
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>