diff --git a/share/pgpkeys/clive.key b/share/pgpkeys/clive.key
index fac89b0bcc..7642b56adb 100644
--- a/share/pgpkeys/clive.key
+++ b/share/pgpkeys/clive.key
@@ -1,70 +1,109 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh clive A008C03E;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
 pub  1024D/A008C03E 2001-07-30 Clive Lin <clive@tongi.org>
      Key fingerprint = FA3F 20B6 A77A 6CEC 1856  09B0 7455 2805 A008 C03E
 uid                            Clive Lin <clive@CirX.ORG>
 uid                            Clive Lin <clive@FreeBSD.org>
 sub  1024g/03C2DC87 2001-07-30 [expires: 2005-08-25]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: PGP Key Server 0.9.6
 
 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
-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
+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
-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
-=Qpsc
+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
+tF/cItKqIqZ9RhFcg+IisxgUtQ==
+=g51D
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>