diff --git a/share/pgpkeys/ehaupt.key b/share/pgpkeys/ehaupt.key
index 84b1a4a2a7..2d80ce2c83 100644
--- a/share/pgpkeys/ehaupt.key
+++ b/share/pgpkeys/ehaupt.key
@@ -1,61 +1,45 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh ehaupt 55E67774;
+sh addkey.sh ehaupt 90215DB9;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   1024D/55E67774 2005-07-08 [expires: 2007-12-19]
-      Key fingerprint = 17B3 FD8F BA68 4AB4 10FD  A9D1 AD52 6588 55E6 7774
+pub   1024D/90215DB9 2007-02-06 [expires: 2008-02-06]
+      Key fingerprint = 741B C70F 100B F360 0B52  E92D 5F01 7A86 9021 5DB9
 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]
+sub   2048g/6DD0929C 2007-02-06 [expires: 2008-02-06]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-=YuMZ
+mQGiBEXIhOYRBACqxbx/nLwG1OVuFs1wt2zASY5P1JbyZ+DA0+21YKpYz6EjRIcn
+j3Y1FFJO5T6pR8yTMz47rEaT4K9OLigYZkwWg8G0WUqby/CJPylEkAwrhg8do7ys
+kwTJMg8nOlSyv+m9KFK2C8mhcp/dGqp/Ev91iAKE9M7wCNxYzZGk/lHnVwCgi3yc
+rQReRXDrXkOnJr0v4g93T58D/3rrIQJoFa90o0iUCatDJxvQ5eG0vxVPcERssGF1
+vUAWFJn83cImWHltpOEWyBgOnfjfkFKZolG7QXBejJEPXYdSKzinDT5yqWXQXCHn
+YCQxtO4OPxgtlV56sAlAeZgytuGfmkNfzkhoN8nRD3YXBlVWrhQwhVdmv5MBi7Pz
+RFdCBACk+4WuKIVkRCKualPZocELQnAXuD30AFqGP3w7EAac8dlXumsgdQsP667G
+R/RaBo2nks+tA8L3LXkMCgSCHFP3y4F82BFaNufkf5aTGDk4KOeEOLa4Wn2kyAQb
+kxIApsN1T7y//EFu/VoRRIx7sU91ep1O4Ww3TPhpaqm92OGfsrQiRW1hbnVlbCBI
+YXVwdCA8ZWhhdXB0QGNyaXRpY2FsLmNoPohmBBMRAgAmBQJFyITmAhsDBQkB4TOA
+BgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQXwF6hpAhXble+ACeL4FCsn3oEeNo
+3OSZGqK7HyeSTvAAnjSUwB+7Fi1OIiOzQVIKo4a76IyJtCJFbWFudWVsIEhhdXB0
+IDxlaGF1cHRARnJlZUJTRC5vcmc+iGYEExECACYFAkXIhRECGwMFCQHhM4AGCwkI
+BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRBfAXqGkCFduYUwAJ4gfS+qakG4VbU4zMW4
+uBMXB9jg9ACgguQQkvNLpX0HktmO0BvhVRkGUsy5Ag0ERciE7xAIAJzXp5NhJ2vr
+E1mxRlgeWrTzQ9/W2D1+MAQvH/nEZLq3yS1snyLvk6KQooRN9MP1hftWMOSsAs5u
+cvrnKJOxouK2bIAdd/dk4dwVky9kq95PHow1NNiVEdWX+CxjmZXZ6uzr5XpXqSVl
+A8aaZTaSoAT0hzDWnQ59HdwzbEDwNGQrSmLmxK4TxmYsVM//KyPnG2tGb+lrIsf+
+6j7m/QrHrf/5j0hv5OGtnD75f8no7BpNZ6nKfusM8j1qECf4GA0rQheXLsMalst8
+MwZecaxWdvdHugiJUFbyRrBFWYWK2Ne0wyPTx9mK/CP2ayLJro9vsA7Tix6d1S8z
+4kkFShsxveMAAwYH/3EnNUO2EpN/R9uogeEUobHifbTz3Da/xe9/+k3iMZbW+6TF
+ntw7aFzemeAYVabFPwqyn9FfzMAsOlz0u7djn8X+lp22Nvr+eYjfnSyGfGu8Uso/
+KKdg4QeshrCcIDVdYBa314aatPRIBUO0qPRJISOhXC3NV+6QDaODT6p1xtsDSfdK
+BDct6uqntgHRssTzTlBZzwoZeoC0RqcIipG1Ly+y/yoTou1MiOoN1SvLMsJtrENz
+3+oG4p2yoZY5zodvJNmus3ArxHyVpn/iM/8onOufSZnftgDay3XPqxUIBVlpXLZt
+CuKP1XuWS8odKzGYrFAuWq4TW9QbkuRY0rwpCs6ITwQYEQIADwUCRciE7wIbDAUJ
+AeEzgAAKCRBfAXqGkCFdudl+AJ9Ik+uq4ank2SalIwfF2iFnNb0ATwCeLqLQIWnM
+2KoyQBvRCcKpNGcqYUY=
+=8Iic
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>