diff --git a/share/pgpkeys/delphij.key b/share/pgpkeys/delphij.key
index 77e0cde363..aa14de3256 100644
--- a/share/pgpkeys/delphij.key
+++ b/share/pgpkeys/delphij.key
@@ -1,68 +1,128 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh delphij CAEEB8C0;
+sh addkey.sh delphij 42EA8A4B CAEEB8C0;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024D/CAEEB8C0 2004-01-28 Xin LI <delphij@FreeBSD.org>
-     Key fingerprint = 43B8 B703 B8DD 0231 B333  DC28 39FB 93A0 CAEE B8C0
-uid                            Xin LI <delphij@frontfree.net>
-sub  2048g/A44AC9F9 2004-01-28 [expires: 2005-01-01]
-sub  2048g/073737FC 2004-09-16 [expires: 2006-01-01]
-sub  1024D/1159888A 2004-09-16 [expires: 2006-01-01]
+pub   1024D/CAEEB8C0 2004-01-28
+      Key fingerprint = 43B8 B703 B8DD 0231 B333  DC28 39FB 93A0 CAEE B8C0
+uid                  Xin LI <delphij@FreeBSD.org>
+uid                  Xin LI <delphij@frontfree.net>
+uid                  Xin LI <delphij@delphij.net>
+uid                  Xin LI <delphij@geekcn.org>
+
+pub   1024D/42EA8A4B 2006-01-27 [expires: 2008-01-01]
+      Key fingerprint = F19C 2616 FA97 9C13 2581  C6F3 85C5 1CCE 42EA 8A4B
+uid                  Xin LI <delphij@geekcn.org>
+uid                  Xin LI <delphij@FreeBSD.org>
+uid                  Xin LI <delphij@delphij.net>
+sub   4096g/11A94A02 2006-01-27 [expires: 2008-01-01]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 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
-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
-=9KFd
+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
+zqOMMNOh4KXMYi8ANHEpRZ2z
+=oIge
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>