diff --git a/share/pgpkeys/des.key b/share/pgpkeys/des.key
index 4ed130ecd7..31fc5dafba 100644
--- a/share/pgpkeys/des.key
+++ b/share/pgpkeys/des.key
@@ -1,130 +1,52 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh des 0512E49A 27848427;
+sh addkey.sh des 8B71D3A4;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024D/0512E49A 2001-06-26 Dag-Erling Smørgrav (office/general) <des@thinksec.com>
-     Key fingerprint = 94BD 6AC7 695E 4861 E27D  DC7F 6726 88E1 0512 E49A
-uid                            Dag-Erling Smørgrav (office/general) <des@thinksec.no>
-uid                            Dag-Erling Smørgrav (OFUG) <des@ofug.org>
-uid                            Dag-Erling Smørgrav (FreeBSD) <des@freebsd.org>
-sub  2048g/F409452B 2001-06-26 [expires: 2003-07-01]
-
-pub  1024D/27848427 2000-10-13 Dag-Erling Smørgrav (low security key) <des@freebsd.org>
-     Key fingerprint = 58B8 E93A 659B 0FFC E3FA  2B45 43E9 5DE4 2784 8427
-uid                            Dag-Erling Smørgrav (low security key) <des@thinksec.com>
-uid                            Dag-Erling Smørgrav (low security key) <des@ofug.org>
-sub  2048g/CF429755 2000-10-13
+pub  1024D/8B71D3A4 2003-07-01 Dag-Erling Smørgrav <des@freebsd.org>
+     Key fingerprint = FDD3 5997 92A0 007F 9905  511C EB80 DE1D 8B71 D3A4
+uid                            Dag-Erling Smørgrav <des@des.no>
+uid                            Dag-Erling Smørgrav <des@ofug.org>
+uid                            Dag-Erling Smørgrav <des@ifi.uio.no>
+sub  1024g/CC6B8628 2003-07-01 [expires: 2004-06-30]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.7 (FreeBSD)
 
-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
-=bVpV
+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
+=Ewrd
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>