diff --git a/share/pgpkeys/ehaupt.key b/share/pgpkeys/ehaupt.key
index 49a714a141..84b1a4a2a7 100644
--- a/share/pgpkeys/ehaupt.key
+++ b/share/pgpkeys/ehaupt.key
@@ -1,65 +1,61 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh ehaupt 55E67774;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   1024D/55E67774 2005-07-08 [expires: 2006-10-03]
+pub   1024D/55E67774 2005-07-08 [expires: 2007-12-19]
       Key fingerprint = 17B3 FD8F BA68 4AB4 10FD  A9D1 AD52 6588 55E6 7774
-uid                  Emanuel Haupt <ehaupt@critical.ch>
-uid                  Emanuel Haupt <eh-lists-freebsd@critical.ch>
 uid                  Emanuel Haupt <ehaupt@FreeBSD.org>
+uid                  Emanuel Haupt <ehaupt@critical.ch>
 uid                  Emanuel Haupt <haupt@critical.ch>
 sub   4096g/CDEE5E7D 2005-07-08 [expires: 2006-01-04]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 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
-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
-=pFC/
+w4Nn/4UNG8EeJOqlCU8LEOM66eCY8Gcv/Abx8o7ap2a2+Wz3+LQiRW1hbnVlbCBI
+YXVwdCA8ZWhhdXB0QGNyaXRpY2FsLmNoPohkBBMRAgAkAhsDBgsJCAcDAgMVAgMD
+FgIBAh4BAheABQJDpoRLBQkEmodRAAoJEK1SZYhV5nd0qoIAnR9A6Q1k1LovDtUz
+ZIsiHtgAzYIyAJ43rT42i14gRp+YnVn642g10PbXpLQiRW1hbnVlbCBIYXVwdCA8
+ZWhhdXB0QEZyZWVCU0Qub3JnPohmBBMRAgAmAhsDBgsJCAcDAgQVAggDBBYCAwEC
+HgECF4AFAkOmhFAFCQSah1EACgkQrVJliFXmd3R+SgCeJqar93wBu/UPu3UBE4eX
+GPLwk5MAnRvtb4ODXA1L5O6PPT7HXohtQkjHtCFFbWFudWVsIEhhdXB0IDxoYXVw
+dEBjcml0aWNhbC5jaD6IZAQTEQIAJAUCQs5j+gIbAwUJAO1OAAYLCQgHAwIDFQID
+AxYCAQIeAQIXgAAKCRCtUmWIVeZ3dMK7AJ43vJ/xtfJ94KnJlzox5XWtF07G4gCf
+bHMVyfkKGyg41O6psYhLJSERT9uIZAQTEQIAJAIbAwYLCQgHAwIDFQIDAxYCAQIe
+AQIXgAUCQ6aEUAUJBJqHUQAKCRCtUmWIVeZ3dCdtAKC9wntanPm9k/WhqvdMl9na
+LVd0SQCdG5xt0+tlj98i+j+0yUDG8j7Q6Y+5BA0EQs5koRAQAJim440UZPfXtYY3
+jxgAxSyyoyKNRV/OxoFvPy89NuQLGlM27qMV+hFSLqkdKwgTtoXBDwcYFwxvLDm9
+Ono+gia0aK6qYkd225ls9uT5uVhwsiEp+WPdFBUgDwLqTVIEJBphAXl4TWU5FJz7
+BvoRrPgWwlZnNwPaiX2ffvVwp460NTeHRWQT7hxmMvVlKII7A6U6od+LPXY+D6rX
+Ai38Rr8Jqgn1OrKQ8Wu8yxcEi6ev5SQubVIWjI9ZC8owVDhgvrNbwWN1/QoDUxci
+iodHMCPDjcVsMwr/Aju4IYUqppKwuBwWfmUe3pIym4Juz/XffGaC+ao86kroy6cj
+KBEv45u24vxgnfxD4ixR4KKVZgN8j6O8mP+zpX2acfaRhYzlmGhp26vEp0KsW328
+CfzLJNKSGcEmSMqvwCdKNxeY5jUK+q9J4Sb4oKM4MidBOaNb8Vp10DBw3V44/KKV
+qbTJviwo6R8+iIV/2uYazpz+1+L7KkHDVNiEfxgvqEkn415YSnkyiQXoBTv8YVTL
++6JSCVNtdlHgvFostJFVWA7HIfHWmDfdtKVm6UPJV6he1ysJgui+397GLPTY4ocK
+2xGuBnqNbIANDBHYYU+yo0ZAS+f+DjVLjWIw2QjMcFp99Gu53r1yL3WKTkb5Y50V
+ZL8KtNS8OFxIlREZxvMM9em1AcV3AAMFD/0Yfv3ZxBK8LE6hwcwAOSij6lkmz804
+DmdvbrVSzW3OJGObeDzXo1lMNEvjQePqgbVsunrJy8f3hsgh0r4lKEPFbs3k3R0U
+sgTB5veLueM9QFpG8E9l6m7zQmKfDiVDJ3fpCO7/l1rGQvnv4RmBHrtFYcuTOzHc
+JTNnRTHhoaHdgdpXNat0qVdSFNOvYsYE/VhNekpMGtjKDqp4lRm5iXiC1VE16hcA
+HJe0XP6Ir18R2WLZkYnySwJfKkmKXnzGthOvUxGTVX83kEWmOY2Ek1W2GAlabheA
+ll75FK87RvUi4aZUADAvzslhqHE6uQ+WlGTjyUb+Um7bE4NjmvDGxFexs3READkS
+eYqgLW/+1h3QIm3Y2yE7y+1RBOp/nJ/CMTDd9ItC0xSJujLNxsYDohRoQCAGHsxA
+e2DY1ty9pPa0Th/VK7F5EXayzo6FeBdhlcJJTCfmxed/xvqHW27JH+4myC6M/73C
+kGh4qD6b15/vGzqxaHI81E1wS25ruKl2oXV/TWWxkjYqLikLAMzHMaUsqbFNPzke
+hkJ/nL2PEIGTBk1qgDjK6EBfphhN4G+RNOMRv/j0r7nSu+3lcvBdg9NnIYz4JCny
+IB46mqZ7zsKRaqVHafuAR6+hETMCJFfGCRTDStq7ME/nu9Vhise1igLySeeRY8Fg
+BaoKEtpT13EGeohPBBgRAgAPBQJCzmShAhsMBQkA7U4AAAoJEK1SZYhV5nd01YIA
+n2mijPfUKdQDQmz3hImenoJ0GaxDAKCQv5AmGG13+sg6TcCiQ2RhCJKFuw==
+=YuMZ
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>