diff --git a/share/pgpkeys/garga.key b/share/pgpkeys/garga.key
index 2c45a05786..052cfadcef 100644
--- a/share/pgpkeys/garga.key
+++ b/share/pgpkeys/garga.key
@@ -1,71 +1,62 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh garga 5B9E04C3966B861A ;
+sh addkey.sh garga 6A5918C8F4222329 ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   rsa2048/5B9E04C3966B861A 2017-10-31 [SC] [expires: 2020-10-30]
-      Key fingerprint = C718 8B34 CAAC 9FBC 9799  3CBB 5B9E 04C3 966B 861A
-uid                            Renato Botelho (FreeBSD) <garga@FreeBSD.org>
-uid                            Renato Botelho (pfSense) <garga@pfsense.org>
-uid                            Renato Botelho (Personal) <rbgarga@gmail.com>
+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>
-sub   rsa2048/C6536261FD462298 2017-10-31 [E] [expires: 2020-10-30]
+uid                            Renato Botelho (FreeBSD) <garga@FreeBSD.org>
+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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
-NtNZTnM7k1pRv5Ovfms0VzARITYzTwmpDQ==
-=6QSX
+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
+Xp2joykgniXT2qbVUjXjGRc=
+=4qni
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>