diff --git a/share/pgpkeys/wilko.key b/share/pgpkeys/wilko.key
index f0e1b6479a..1b42a9a22c 100644
--- a/share/pgpkeys/wilko.key
+++ b/share/pgpkeys/wilko.key
@@ -1,33 +1,57 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh wilko EADEE409;
+sh addkey.sh wilko B5F2C0E5;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024R/EADEE409 1997-06-16 Wilko Bulte <wilko@tcja.nl>
-     Key fingerprint = CF F5 30 59 20 AE 17 69  98 F6 58 F0 4F F0 EB 3E
-uid                            Wilko Bulte <wilko@freebsd.org>
-uid                            "Wilko Bulte <wilko@freebie.xs4all.nl>"
+pub   1024D/B5F2C0E5 2005-01-26
+uid                  Wilko Bulte <wilko@FreeBSD.org>
+uid                  Wilko Bulte <wkb@xs4all.nl>
+sub   1024D/CEE36724 2005-01-26
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.6 (FreeBSD)
-Comment: For info see http://www.gnupg.org
+Version: GnuPG v1.4.0 (FreeBSD)
 
-mQCNAzOldcsAAAEEALOm0m0njPXcJXJerVjwiLMA0jho2mJFtWqup3Dj4Z/ra8JT
-k+tf9deja26fG2PjEaDCLogjdKIhF/ZKFAxxZnaoIevhc/M2Tt1m4GuOe8gTR1t0
-BdqsjR8zY834LTFlYxF40w7UkdAvqynAkX8kDD1ydfAkCEJB+6fGT4fq3uQJAAUR
-tB9XaWxrbyBCdWx0ZSA8d2lsa29AZnJlZWJzZC5vcmc+iQCVAwUQM6V1y6fGT4fq
-3uQJAQEasgP8Dy986Wy0UhnwhQiYcyWbSnUtzwYH8Tgxh2hNixr3jEr7GTVQn/Ik
-rt7QDk7+0b++RQuZs2c23Iie7TLS+g0yihx+l/LSvl5EWMBpLrKebB4MinvwtRBM
-iTJtpoK9CqDT0hYO3N34oRlf1FBaaFAyyfi1HYWrBEMo0ja5oHfwCl60JyJXaWxr
-byBCdWx0ZSA8d2lsa29AZnJlZWJpZS54czRhbGwubmw+IokAlQMFEDw7STynxk+H
-6t7kCQEBJY8EAJXiHeP8NoMvIL6e6QnKmg+FiP7Lel+L67KNa07FaAykDQZpn6Tx
-TxYxuJvkmjdRLfZ6Mbm3kehqXl8VpL2ygmt2ovXT3RRaQ2RpydujFxnHb8SJDZVp
-TfHILcnILe0YDUmEzhMNhjSE1DcorpGNQAsz6udYwjb96HcOkG43enhAtBtXaWxr
-byBCdWx0ZSA8d2lsa29AdGNqYS5ubD6JAJUDBRA8O0mNp8ZPh+re5AkBAWBZA/4n
-kQGBkrS2neeUbdIzF9u3Udy0bf8dUkojjupbjCHBH8IxlNzkq1K/TvCDPkeKxriG
-Qq4Zi6GasGcgJpUJV0rK9bZaeVI8xNeqFm9VkLlvCXrgOKborLR8V+T52WB+C3+X
-YsQre7WGrvmof6B+p1LbcFuYSq7XnYP/sU4htprVTw==
-=AxGr
+mI0DM6V1ywAAAQQAs6bSbSeM9dwlcl6tWPCIswDSOGjaYkW1aq6ncOPhn+trwlOT
+61/116Nrbp8bY+MRoMIuiCN0oiEX9koUDHFmdqgh6+Fz8zZO3Wbga457yBNHW3QF
+2qyNHzNjzfgtMWVjEXjTDtSR0C+rKcCRfyQMPXJ18CQIQkH7p8ZPh+re5AkABRG0
+H1dpbGtvIEJ1bHRlIDx3aWxrb0BmcmVlYnNkLm9yZz6JAJUDBRAzpXXLp8ZPh+re
+5AkBARqyA/wPL3zpbLRSGfCFCJhzJZtKdS3PBgfxODGHaE2LGveMSvsZNVCf8iSu
+3tAOTv7Rv75FC5mzZzbciJ7tMtL6DTKKHH6X8tK+XkRYwGkusp5sHgyKe/C1EEyJ
+Mm2mgr0KoNPSFg7c3fihGV/UUFpoUDLJ+LUdhasEQyjSNrmgd/AKXrQnIldpbGtv
+IEJ1bHRlIDx3aWxrb0BmcmVlYmllLnhzNGFsbC5ubD4iiQCVAwUQPDtJPKfGT4fq
+3uQJAQEljwQAleId4/w2gy8gvp7pCcqaD4WI/st6X4vrso1rTsVoDKQNBmmfpPFP
+FjG4m+SaN1Et9noxubeR6GpeXxWkvbKCa3ai9dPdFFpDZGnJ26MXGcdvxIkNlWlN
+8cgtycgt7RgNSYTOEw2GNITUNyiukY1ACzPq51jCNv3odw6Qbjd6eEC0G1dpbGtv
+IEJ1bHRlIDx3aWxrb0B0Y2phLm5sPokAlQMFEDw7SY2nxk+H6t7kCQEBYFkD/ieR
+AYGStLad55Rt0jMX27dR3LRt/x1SSiOO6luMIcEfwjGU3OSrUr9O8IM+R4rGuIZC
+rhmLoZqwZyAmlQlXSsr1tlp5UjzE16oWb1WQuW8JeuA4puistHxX5PnZYH4Lf5di
+xCt7tYau+ah/oH6nUttwW5hKrtedg/+xTiG2mtVPmQGiBEH4DRgRBACg7IO/FCiO
++xTGPWWjZiJUkN99n6j9Cd+BeX1Qab8hWTujUg6Z4k6LMMo7/OcanBd6e/JeJwew
+1FLArQ4e39D0D0nWVT3Oxj/dgN36wjiL5ZqVOW/9CX31E0kD2fBIvM7AVDfmSfGE
+MKFENjfpuKuWqtrxAOnvNuRbGgu3UdlmIwCg8Ru4HGdG6EjHPIvfmYy3uI+e1zcD
+/ApFqptj70U+ekooiwEsADQf79G3XXG8DYI9f6maC8pKyFnMqQlkWZ9oja5V+rmf
+Oxj7uzlrYtPIc0V6CFfREtJY2uRYC7J4U05OqkRo1f8HoXNs8QyAj4XMngOG4bCm
+k+hse6pUlslTBDQi1dApb/rm5rV8PB4nNelbMbw59iR3A/4lrywMjYl4ZHT9cZMk
+YinJn1JrbCYkGHXySA7VdUxhxDN4eLuBIeukeYvJzz3G9rZ9e7DieTT5OHAB8L4W
++YkZVGauZKX/iOnUwR19IP7XNMcQAHyRpggc+THQopIHY7+dT3NcwzIDw4qF5DOe
+axGPa8LGL5ubfBHISKBjL8UpxLQbV2lsa28gQnVsdGUgPHdrYkB4czRhbGwubmw+
+iF4EExECAB4FAkH4DRgCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQArShaLXy
+wOUNuACgmKGSYHC5ShF2RYJ5jaArbFY1+5cAn2ho831gUFXnxLjk2mY771T0lSfd
+tB9XaWxrbyBCdWx0ZSA8d2lsa29ARnJlZUJTRC5vcmc+iF4EExECAB4FAkH4Dc4C
+GwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQArShaLXywOVW/gCg35nfhvEpv8Wj
+hj8qfR7HgyI/TxMAoN71AEq3LBAcleHuXYATBT/iZ+MauQGiBEH4DWYRBADb5KdL
+l5JbBNDAlJeVFwAYYXioY+Vl+9Qi7gY8yiGKf+p17NinS3u76MI2iFPLDdb4Gmvg
+zPIzWUge3ajUDS8+3P7aNBBVWLlCWfmOcQGBM3NT+vokt3vmAz0Dyf9A3xaNMr8+
+px4rIZDc9pNU+RSA1x7hWX90zkfPpUzrAJCF9wCgr4C7WE1wi7EvcZt7rfft2mWg
+C5cD/3KeSiL3LBeValZmVoNQDG2kksMt+LxT/8bon9VQtcWABKtqw2Uj43PLDvCT
+mTw/H7bVi5zcGxhsvWZ1zyWaVCVzSrjR20rSGA/ZZ22MLXh4/TsDVvOyTqmh4XDq
+UfjRd1AHMZ3aD2yC/JljUJ8581Bldnih3i4mVSO4x0F5fV0FA/9qfjBbIrY7Bg3T
+P6VtsmaD9a0xWzHXnhn/b9zzjKn0b4wx0ukIksw2GAP2J5I24IOtWVR7BcsEDoW5
+tKCCUmPnZ13wfzYiL8ivpIkRrEdHP3hQjV5tbc7loCDqOw6bKlvagy/LdiGxUgxA
+/ykPxELFAb1IGZezrkbc/PjrMfMBlYhJBBgRAgAJBQJB+A1mAhsCAAoJEAK0oWi1
+8sDlo+0AoKCOwJOZ3OvlXhT/rthPvh9t/yyCAJ9CyW54m8OfEudcSReRGJ6XyvOD
+Eg==
+=55M1
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>