diff --git a/share/pgpkeys/miwi.key b/share/pgpkeys/miwi.key
index 3a33a2f320..fea1ffb528 100644
--- a/share/pgpkeys/miwi.key
+++ b/share/pgpkeys/miwi.key
@@ -1,41 +1,51 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh miwi 05682353;
+sh addkey.sh miwi B1E6FCE9;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   1024D/05682353 2007-02-23 [expires: 2009-02-22]
-      Key fingerprint = 0015 BE4D 349E 4DA9 46A8  4BB1 170A 7270 0568 2353
+pub   1024D/B1E6FCE9 2009-01-31
+      Key fingerprint = C022 7D60 F598 8188 2635  0F6E 74B2 4884 B1E6 FCE9
 uid                  Martin Wilke <miwi@FreeBSD.org>
-sub   2048g/B3BEE707 2007-02-23 [expires: 2009-02-22]
+sub   4096g/096DA69D 2009-01-31
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQGiBEXfb0URBACpP2zumJYTzhsHZyKsUnKrMNHjt2b9B+pOWxWJuxyozdqqdFew
-zJo9s2odwMhAjyeM8Ad5Z4vjIaPAhUbIfNBuh1TYKKtAPhGpGJlwfo6yw5IIO5yy
-2jW8Eg9ui5Q4PW3VvCSftHYLFgRIQiKINeHLvd61ZhQ7nD9Kelj/AzVLgwCgrqtO
-Iio/laByeyAA9aXWiV1IAkUEAIWJOj1tIcn45jt20TVw9j0qbRXWstFkwuNxy1yU
-zwO8aGPIKO3osqMZbFJ16qK27z6d6KsnVVY+Psd5TP6t9lnt6wz4gW7CnuLgBvyw
-xhBbAJGLKPeqJGhM7cUFdpQKMxM6o29mJX0uKF8VtjuXD0gCiYGJ810kP8YV5Yg8
-8I0zA/9UhgHcHfSREd30xRR3fqd2HTvUnHHnDXMJM4X3hORC63B07r9Xh+/KT6h9
-/lD3HSQtFB+aPtuRagEjnofS7z1OV4pwZorJ3w1h9pLvLaMD2QZanVz5NMXBhEge
-NjB+qIxeUrtodjNREGkub4eIt0btK8ZJFKE8PTosGgh/VgBiELQfTWFydGluIFdp
-bGtlIDxtaXdpQEZyZWVCU0Qub3JnPohmBBMRAgAmBQJF329FAhsDBQkDwmcABgsJ
-CAcDAgQVAggDBBYCAwECHgECF4AACgkQFwpycAVoI1OMBgCggnTYBWo2PBRGtEN+
-3LTfB2cZK2oAn02cm3rjpYnoK9xWrmufTmGDEkgauQINBEXfb0cQCACe0r4ipQiG
-NyuobvcNK1YvSIE4l9zMZSUIxkSf47Z9i/+fLkzjh0V6ZORZvFXFewzHXqugvmHZ
-c6OkNJV/Wi/SumVfMZjhfetRBxZVTyMKj5KXn3VEhY8/xlktbpCb3/j9xYSP7Isr
-vpPrN/uV0KuJBOxYv+/L5nJVb+JGg6Hq4GlsvlrCf1FsZJH9rtIZqN3Z3573bGR7
-zilrD1soG5VnQRWlhEfKVbdUu7s+8tA0zBCineAUvO35pcUhuDjAz0MNPkTRDQb4
-zahe3oCwFNZtneoloIWir7N645gnU8wlaEaAfLopfRlZajieGSQbtbGJ+61OXrft
-DBz+hgKg3zpPAAMFB/9qerazeS79oy7bRW7T5OvIrhmyR/YIL2FB3BCpIFU6djRM
-PVytE18MMhXesEq0GsPNvAunZbTrVZXoGqxhOagIaRIPoe84PwAWEm7rcUSFXdea
-BQvaxjgYpsRuJRTrP1q+EzjVc+AybcWw+GPbDS8FBVCCGWeDbxw+wrHpyPJzJog6
-vgGbpR5Yx8a91MXp4vNFoYIAIwESAx52CYMPGO566EYtLRzsyYC6sgvq/7Cz66Dz
-yPhZ77cNi9UXBzl6nKcA7zSrwchG64CC35aBtB5Fvyoh9X8rU/AHAsIMKZfOABdD
-bx4SPG1DZSiANQA6+3lg+u5OC2ck2UZL+E7Ml3w6iE8EGBECAA8FAkXfb0cCGwwF
-CQPCZwAACgkQFwpycAVoI1NjeACgh5Oy3aAD8a7JteBaP1aatIcJlB8AnRw68QiI
-afk0yZjXS9DwfZ+NfvQO
-=4d2O
+mQGiBEmE02QRBACEWV7eL0shCAA+vdpkBCMxrQkbRAceOs8+uhsaocAai3TCiyUg
+Byzo9OKlenJ+bcZHFsBx0mUDPBRFF/NJPfhh0EpkMRc6VKvCHsuvjr1717gcWbLa
+ibbvard6cFAAUDXGIn0/hPABtBidFcA4vIb3EQES0PbnXEVfOz1gymojlwCg4/8D
+0ZICstqkxQMN+K6p/bpCV9cD/iMHVKnPCD9z9Bk9IJtkDGQ66OQpopY+oxUy9ZZE
+yO6Gnf8vDjPmPZ5RcDXu0XHlUpUF4yYkdnUKt9u71SVeDlBAQeFwRgDj0zbYKskA
+Py9YdR7bXbDPIuuAZyJv/93MKryHAEyr8aieAoRZ5zslRcOUrRbzueKi68P01xM2
+H6Y3A/0bE+8jz0WWugB4d/D1qmpnxIHIbzWN4S2NICJmMcj/jgoC+p+DTl7TH6Rw
+KfTt199A4n/g8bfrI86hOQWNY9l9CcBqxwJNMhlY5a3Y6y81tj98oIFuTonyZEDd
+GZmXp4JBDEIYHVVL0XyD6pvFT2NLr0UHWAFZwsiWK+W0IrByWLQfTWFydGluIFdp
+bGtlIDxtaXdpQEZyZWVCU0Qub3JnPohgBBMRAgAgBQJJhNNkAhsDBgsJCAcDAgQV
+AggDBBYCAwECHgECF4AACgkQdLJIhLHm/OnvuACg499DhQhK0dsl+rDk2l+Y40Ec
+DiMAoNVTN6ybdr16bfoIoYddjsnKn9rPuQQNBEmE02QQEACo7w/pIuz1jhyXiKMh
+n6/LWwQNdIl5WT4E4DSB2/NmIVkGTwyyUET1nE4NyOVJWeHujK+PxZbtmx7OVe6J
+niwxv2NeWJ7EkLoeDTrSBKrFCqWRHpbN3bSUAaXiwU9HeHMbGjvvVRg86gzrPKlG
+I5blbT5N5QgQESuvS5eOgGZLbUptNIGwA0hUWOPN1YR6584XGeV0N18GzcB2nXn3
+4Tj82IpeqF/iRY2VxZU3EcN4BoeDYcibPygA3521jWvPOnC9/uqeY/RsORKvyLsT
+CsEx3pRew0vhbJ8me8WkFPwVczJNWqdhEjxMm0NS9FyBDRgXTn7cROJiuonrGWtY
+6HOEHIFsCIzCTfXG0zDaC6kc3k7g4Xlz3juzOL/mhDjnbH+G6VlqfHb6KP3YZnU5
+fXtwFTRF/AFDv58m7PFGwAWjIU3mARzbhdKN71FQnp6aEdWIY/3ZyTAs+En1RWgR
+bHEO7Jg+55V6pH/Cn1p/aIXYDOqIp9HMi9w8nxM2mFt55MiqdUX4RkPxwUdy6BPK
+22LxmxYBv4XrdQNbwy2n7k8H+wfQrKhP+oEKM9WFLTXpKPf52xTB4svJMd1yBZXZ
+FJZSArffJ/QlZ2HgC37V2HcXUOlvU1K+tan/xY2NbJmuetMU7N/ePUWyi4mg3Nww
+EzUpR59KjrqNI2if2qX7yjCB7wADBQ/8D2LYxz9SCqp6iebELuTBWbHtBX2r5xyl
+Z6CuDyjHQy+LOW2D2WEq3b1jI46HFp5O381jKNDJxx2z6o9E9dV63wFbGWIxoAec
+TEdbtf5NBKljFsEtdSg8xdaQa/8FdnTm9EK1MV3C8KqH8e1VBGaHDOlPU1t9zrhO
+Nc96n8OCl4yk+VldoVycqIgdpta4e8jR6kMGLlCXq4Mq6xR5usUoo6jSab4PSEC4
+BZDE4WCzbrahrsJGK4hVmpzi9ofGiqOPf0+XUWG7Na6HyW4GJPohVmjJHyjwc4rf
+bHtJTu53Hk6S10HHYwbRJz1YO+08KrybtvdzXgTv2C/dYBmjheN2ylKmaXYo6bAa
+GcVmW3gFEUTWQd8qQtUJzL6LgreUjuY9xv7Z9nUc7SL63XfAjs3H75vavNWZ8Y/J
+Su/WuKXKxkJDLwzcKHnUVOegEXe0Q6+Khe056WSJ3VtF8+tAaksN7RRslrf1MmVt
+nVag81z/1UvOwNsyLVEucPnh/8LZxD3plUvscKm3w7rsuWiQ/Wtn/NCW9MBeZuxR
+QAUnfWbvHPBo1Dgo1essw+Q4crMGAprk/T8/kPuxrHQ3ZydT0e+t+noDCxcLeoP+
+oqS1A/Za+idThWujkwos8clIyW4HryqAejrFhtzhfC8ELkpkjq0B7Yd/8Zv52O1T
+haaPTklRPcuISQQYEQIACQUCSYTTZAIbDAAKCRB0skiEseb86WULAKC5M2ASX7/v
+bNgnr3BzKKDpkqoskACfcKvwwi1c4AsPtLPxbySr6dUwhlg=
+=S3Qn
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>