diff --git a/share/pgpkeys/swills.key b/share/pgpkeys/swills.key
index 1d527437c6..eab447e753 100644
--- a/share/pgpkeys/swills.key
+++ b/share/pgpkeys/swills.key
@@ -1,13 +1,15 @@
 <!-- $FreeBSD$ -->
 <!--
-sh ./addkey.sh swills 207B1BA1;
+sh addkey.sh swills F5CF62B3207B1BA1 ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   2048R/207B1BA1 2010-09-02 [expires: 2011-09-02]
+pub   2048R/F5CF62B3207B1BA1 2010-09-02 [expires: 2014-10-26]
       Key fingerprint = 98FA 414A 5C2A 0EF9 CFD0  AD0D F5CF 62B3 207B 1BA1
-uid                  Steve Wills <swills@freebsd.org>
-uid                  Steve Wills <steve@mouf.net>
-sub   2048R/E9B254FD 2010-09-02 [expires: 2011-09-02]
+uid                          Steve Wills <swills@FreeBSD.org>
+uid                          Steve Wills <swills@freebsd.org>
+uid                          Steve Wills <steve@mouf.net>
+sub   2048R/A36116F7E9B254FD 2010-09-02 [expires: 2014-10-26]
+
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -17,34 +19,42 @@ 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
-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
-eYhPE7EaCOyuAA==
-=7zxq
+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
+=1rR2
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>