diff --git a/share/pgpkeys/leres.key b/share/pgpkeys/leres.key
index 8c32c667e0..0a535ad514 100644
--- a/share/pgpkeys/leres.key
+++ b/share/pgpkeys/leres.key
@@ -1,70 +1,100 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh leres E6A12D12FCBF85E5 ;
+sh addkey.sh leres 50AEC5D1367B0F3E ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   rsa2048/E6A12D12FCBF85E5 2017-09-08 [SC] [expires: 2020-09-07]
-      Key fingerprint = A754 2364 5207 B964 2016  17E1 E6A1 2D12 FCBF 85E5
+pub   rsa3072/50AEC5D1367B0F3E 2020-09-01 [SC] [expires: 2023-09-01]
+      Key fingerprint = 6843 5145 F1B7 EF47 3289  D1B6 50AE C5D1 367B 0F3E
+uid                            Craig Leres <craigleres@gmail.com>
 uid                            Craig Leres <leres@freebsd.org>
 uid                            Craig Leres <leres@ee.lbl.gov>
+uid                            Craig Leres <caleres@lbl.gov>
 uid                            Craig Leres <leres@xse.com>
-uid                            Craig Leres <craigleres@gmail.com>
-sub   rsa2048/6C3DC722090D9F71 2017-09-08 [E] [expires: 2020-09-07]
+sub   rsa3072/D33160A8B63B31A2 2020-09-01 [E] [expires: 2023-09-01]
 
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-9ZMxC5pXgiTTXgcilg==
-=kkrt
+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
+C4JOZcLz+KdVgzn4TC/YaoowEg==
+=/wof
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>