diff --git a/share/pgpkeys/lulf.key b/share/pgpkeys/lulf.key
index 5ae56bcdb4..8f4e8e66e7 100644
--- a/share/pgpkeys/lulf.key
+++ b/share/pgpkeys/lulf.key
@@ -1,66 +1,57 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh lulf 73087425;
+sh addkey.sh lulf ADE1B837;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   1024D/73087425 2003-12-21
-      Key fingerprint = FDC2 6422 3949 9965 0F33  8726 0882 E0F2 7308 7425
-uid                  Ulf Lilleengen <lulf@idi.ntnu.no>
-uid                  Ulf Lilleengen <lulf@kerneled.org>
-uid                  Ulf Lilleengen <lulf@bbnett.no>
-uid                  Ulf Lilleengen <lulf@stud.ntnu.no>
+pub   1024D/ADE1B837 2009-08-19 [expires: 2014-08-18]
+      Key fingerprint = 3822 B4E6 6D1C 6F71 4AA8  7A27 ADDF C400 ADE1 B837
+uid                  Ulf Lilleengen <ulf.lilleengen@gmail.com>
 uid                  Ulf Lilleengen <lulf@pvv.ntnu.no>
-uid                  Ulf Lilleengen <lulf@kerneled.com>
+uid                  Ulf Lilleengen <lulf@stud.ntnu.no>
 uid                  Ulf Lilleengen <lulf@FreeBSD.org>
-sub   1024g/CD5F3420 2003-12-21
+uid                  Ulf Lilleengen <lulf@idi.ntnu.no>
+sub   2048g/B5409122 2009-08-19 [expires: 2014-08-18]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-G7h35Q==
-=VA4c
+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
+L1JhS/1K
+=sCn9
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>