diff --git a/share/pgpkeys/dd.key b/share/pgpkeys/dd.key
index 86da87b32a..feb1e992d6 100644
--- a/share/pgpkeys/dd.key
+++ b/share/pgpkeys/dd.key
@@ -1,55 +1,79 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh dd 69FAE582;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024D/69FAE582 2001-09-04 Dima Dorfman <dima@trit.org>
-     Key fingerprint = B340 8338 7DA3 4D61 7632  098E 0730 055B 69FA E582
-uid                            Dima Dorfman <dima@unixfreak.org>
-uid                            Dima Dorfman <dd@freebsd.org>
-sub  1024g/A51DD1C0 2001-09-04 [expires: 2003-09-04]
-sub  2048g/65AF3B89 2003-08-19 [expires: 2005-08-18]
+pub   1024D/69FAE582 2001-09-04
+      Key fingerprint = B340 8338 7DA3 4D61 7632  098E 0730 055B 69FA E582
+uid                  Dima Dorfman <dima@trit.org>
+uid                  Dima Dorfman <dima@unixfreak.org>
+uid                  Dima Dorfman <dd@freebsd.org>
+sub   2048g/65AF3B89 2003-08-19 [expires: 2005-08-18]
+sub   2048g/8DB0CF2C 2005-05-29 [expires: 2007-05-29]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 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
-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
-EoQZKxCl9C8Iuwj3RgM9
-=6nju
+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
+=hGAK
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>