diff --git a/share/pgpkeys/rafan.key b/share/pgpkeys/rafan.key
index 6cb3f5f489..2bcf27f805 100644
--- a/share/pgpkeys/rafan.key
+++ b/share/pgpkeys/rafan.key
@@ -1,15 +1,14 @@
 <!-- $FreeBSD$ -->
 <!--
-sh ./addkey.sh rafan 86FD8C68;
+sh addkey.sh rafan 86FD8C68;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
 pub   1024D/86FD8C68 2004-06-04
       Key fingerprint = DC9E 5B4D 2DDA D5C7 B6F8  6E69 D78E 1091 86FD 8C68
 uid                  Rong-En Fan <rafan@infor.org>
 uid                  Rong-En Fan <rafan@csie.org>
-uid                  Rong-En Fan (CSIE, NTU) <b90098@csie.ntu.edu.tw>
 uid                  Rong-En Fan <rafan@FreeBSD.org>
-sub   2048g/CC9AC94F 2004-06-04 [expires: 2009-06-03]
+sub   2048g/42A8637E 2009-01-25 [expires: 2012-07-08]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -56,38 +55,37 @@ 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
-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
-6D0=
-=ZFgs
+jKbYq4y+BwCdFbqSBm3EwGgfzQZfvF42tacT2pW0H1JvbmctRW4gRmFuIDxyYWZh
+bkBGcmVlQlNELm9yZz6IYAQTEQIAIAUCRJ9B9AIbAwYLCQgHAwIEFQIIAwQWAgMB
+Ah4BAheAAAoJENeOEJGG/YxoTAcAnijL+htNIYKKgPFUHlz7nVNTnq3vAJ42MgST
+to4LKus1wHJ+yXQU1y4h57kCDQRAv+rZEAgA9dwiJBaIMOgZCg/X6XqLRWcxPAdS
+sGy6q+JATYUnndr1mO1QP7ba877G5Z3E+zcUt8fXJCvEzVC+9HhPNr+CQcWzrFwA
+4l5PRUvOKp1ZQu8UrhaEUyDtkTvjLCCSDpMKFv10980UGktlLLqGcCin/3mvFIXs
+3/r53jbc8NQWiARdtS+GApAEYLOOGXlJwmEagze3/suVVCoAP3BOQxccOzyr0TH9
+kEw2ZbAu/SnyqDPy/m5zpHK1Zqi+UQi2NeJAGmDmXydEtuS8lnCsdo3PXs4i6+zc
+NoEn30mEpzIL4G/ij/uDdqTkMdBGJe6ttqHvrY9y9qv6yXj1HX6DLcwUawADBgf9
+FuCIIxzbgQhgW6w8Qnl0JX8P621axNN5XM+KzFxNIuRMAIIla/Ul60V7L/uMcnK+
+qmdzvCbaSurMU6Dm3mHjZXgycmShfWTQD0zKXHAII7hXph5ok9pyGZIxpDlY1ydn
+aemR7bQTFEeSRVVeNXosiLLVssrtGoj/49XOW7xMj4D2LWEpYh8EITWcvSYwLnm8
+mw5DeL/VVV8/WLctE1aoLC/Z69CjaYU5c03p6AUUTmwJgV2KApXUhK8DdALmLQ9+
+PmZ9ZrD+ebfG8b8kArViLcBIz16w9ORruMXUUtd0V1G8rWi2BSUkJYP15N4ih27W
+A04fPTwyIZj1Gw6KEaaBQ4hJBCgRAgAJBQJJfAG5Ah0DAAoJENeOEJGG/YxokRMA
+oJeyIL8CUN7wj31nBuSuet6avyMEAKCRa/oyo1zNL21/N0qEhHgqHLsikIhPBBgR
+AgAPBQJAv+rZAhsMBQkJZgGAAAoJENeOEJGG/Yxo1CwAn3HA6CdfUMTuQdASFp7u
+Q69wn8myAJwL3I9d6WttHOCBr7XNkKcP47noPbkCDQRJfADSEAgAxrX3MYpg/UHs
+Hwlju1XgoVIEzLhYVegcfcp1cWnJ/aoY+i/MJ3BQQs1AOTZ3D2eGKBXbr8BNYY9s
+o9yW03B7nRcqeq4z9lTF1rDkUscKP76xEA8kcPmQEeYcA3L1GJ/qjt6zixlnJ1n3
+dmDqc/wNJe7rQ3XKBCe+GCEkj9EEcKuhpZNbyeBhfa3MRsAPpOl6qg1vXWUxWWsD
+PfFJ9k5gKDUnfN7DiaEvZg84HzZYt6qNhzeR+LRKXt/BwmUIYqfi2IqucUefEkXA
+y3wowsDpMeiA6paKkJFRGH8/dcZTGvAd/SYFwJV1vflwWCmDBpVbqq0Icf2pT/Js
+uFd0RKs5NwADBQf8CcS8DFScqq+wXPDTVz0jjYH+7L/OcXuzLTVgjVgMH7CWSfCq
+9zz+2q29sW5J3MJkclCtkCnZYit7DvKO1AijtUhR8UOR1qNSp8GE03jobWG2ZxNO
+WC0xdRugK6vL5PBIKTBVDJFk/2rNpjgKUxwtHWWxu5GhD6H7iBAEu3SAixKyGo8S
+a6/ZtOflZHb/5yHzk/5yEUuQzm2getqDogkrZa8HqirTaPjDahkDko0wmsl9wsdL
+j73MuWdtnvLjhbhFaPlHro/sRxj5RfJu0x0UvXgdrrFbq+iXGNetT8A6p5rO2kiW
+SiJ3FgSceto3Fk/xp8M/3L9odUoB0c9nPIugi4hPBBgRAgAPBQJJfADSAhsMBQkG
+fSIAAAoJENeOEJGG/Yxo/xMAnisKbRWCpTgCq+VaAvfvJy/lsl+1AJ49pQg0txDL
+D/Fet8nCx6Ef1M1J4Q==
+=1iVI
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>