diff --git a/share/pgpkeys/remko.key b/share/pgpkeys/remko.key
index 9cffb23eb2..34181c9a27 100644
--- a/share/pgpkeys/remko.key
+++ b/share/pgpkeys/remko.key
@@ -1,45 +1,42 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh remko 8F494B77;
+sh addkey.sh remko 6EB8C8C8;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   1024D/8F494B77 2004-09-03 [expires: 2009-06-25]
-      Key fingerprint = 575D 8AD6 8646 E6D2 1226  0A8C D2A9 0DFF 8F49 4B77
-uid                  Remko Lodder (Remko Lodder) <remko@elvandar.org>
-uid                  Remko Lodder (my FreeBSD.org uid) <remko@FreeBSD.org>
-sub   2048g/6BF55109 2006-02-25 [expires: 2008-02-25]
+pub   2048R/6EB8C8C8 2010-05-28 [expires: 2012-05-27]
+      Key fingerprint = D692 91F9 F4EF D363 7F3F  4D17 9C75 DF7B 6EB8 C8C8
+uid                  Remko Lodder (Remko Lodder's Key) <remko@FreeBSD.org>
+sub   2048R/011C6AA0 2010-05-28 [expires: 2012-05-27]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQGiBEE4vPoRBAC4dNWQ87nDcZoYBN06IANIh9vEomUme0YimbljsIozq+BLDgZi
-6A6iQXWpoEWSCOHX5nCnQDS0selxJ7easE8tm2NXHIKLOCStDh9Jk9/dPpvAPAKF
-ZRyRf6emtNFewvQqxaP16Rs3mlvyfzKDWhIp9QPz5SohpgrpsNR0HcU63wCg34zJ
-uXgWapznE1e/gpFHVSdao0MD/ieMQBXiusNFj+ULjm9w+XossGiSuk5t9n5YlLtl
-Y+wpfeXq0bAlAjCHMmL3ZpPsksyTcJT4NEYyd+JUKBT9YVOitXHUfW005qHDFXBw
-5hMl8SritJLxNY7OfEvVeGM06Ipeaw2IwxrSBiN9vmPMpdO9hZl1Vbj0vJ+CTgnb
-l2fDA/9rsMfj8rsFNZipEprRo3tJQ4G+SaZAIvaHxwFC6ecTrIJ16qYfSPOB50RU
-Yuiz2UTQeVUHYcUqzpcVmUAij5WX1gcIrQdYL9BC3Kpp+POc2IPlpHcqcijhHbi0
-WlbRyaMTkARVJ6NTU6wFChvS7WTHwApo7dUJJEYNSYkggksiGrQ1UmVta28gTG9k
-ZGVyIChteSBGcmVlQlNELm9yZyB1aWQpIDxyZW1rb0BGcmVlQlNELm9yZz6IZAQT
-EQIAJAIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAUCRKAV1wUJCQrzXQAKCRDSqQ3/
-j0lLdzhiAKDXhajHOwIGMBW2fRE9kspcC0pfugCdE6uMVulTQyHVUZ+gdV5ngPLS
-axG0MFJlbWtvIExvZGRlciAoUmVta28gTG9kZGVyKSA8cmVta29AZWx2YW5kYXIu
-b3JnPohfBBMRAgAfBAsCBwMDFQIDAxYCAQIeAQIXgAUCRKAV2gUJCQrzXQAKCRDS
-qQ3/j0lLd+PcAJ4oQDiFAGq0gCH0hcNu/yvRyeuFOQCeKbycSr2jMe2m9LR++UQp
-QaaGq9S5Ag0ERAChRRAIAM6a31FevymHZ79ZCv/oG5DjsSVGtM1cYbWvA4C+EStc
-vEWZL/tEMqJipi3tjaxyHPfuwAGd8NyagY89i+YXrpe97OxtbXk8DUDL5KHJH92H
-rLvm40uBIULeQgdXP23RQQxLt6UYQ7nmAMbbU0NKkErNG4KxEc7wX5XFtMoRn06o
-s+CQ6ynS1XYH5yaVRFAOo/kiC0DsQUE/k1e79UvVo7kq++Zmx20bQ8EN8fJWCjpz
-gnXbNArUw3w4Srsbq0mOQqtlLQTuZkwnDdPzmTa7AREDLE3NrEt4xXdCT9iHPyIg
-yqikm5YR/FCLJ3trEq1l/5YLQLC8ygvg4dd6aBm27a8AAwUIAJUg4wJvh6F989Er
-h3bsnlrv6rlo5Ij4ktJeptXjkzT12uI7mBhM5UuLkjrwN2+XCq1qnKtjaYW4yt2f
-rUYXLMQ0jFAH3wus/9rX1AMQMjErDvUj2lZWyc77ETFo6cJQDyy7BQb5A/5fOSv0
-astxip4m4xDAyeiM672jwEJ0H0vIRMXIIfVXj8bmg7da2mylTkku2gsA6moTLKx0
-jBg5P0Q5XmFO+H21Am4XFlIJEyeooaP5CON08tKyE7GyQZTrbRWJe/8G+rNs0jbB
-cpqPHa/0n+G3E7G0zho7QCYGtNh5iIn0/IOXhhoP/wQhh7Ay4Gi4BxtsNfgNWwoq
-q4hHxY+ITwQYEQIADwUCRAChRQIbDAUJA8JnAAAKCRDSqQ3/j0lLd5WJAKCiNEXw
-yNgsPsGLogwW+0OZLjrMsQCg0i8S8DLj+bQdZtkh58Ifdq3nXlQ=
-=jkQz
+mQENBEwAJnkBCADaaSUOhXEQBlgiLmwmq2FKs8cSBc1KEWj5gZLLs+Fh53+rquTB
+yqCP5ZOcP6BozqjbHia/6TQJDgvMTtWpRuLOtdTK7DyMyiHAFMp6TUuQHpRMun28
+rjGcntGi+uoaUk4gUfY1vSZUurKTAWiQH0TiD35qu20PcHhKysNpGqCTtnJF9vYh
+ikZvwbEx0mXBfQrD0tp6A/wHNSGZ0dkobwTDTBsw1Fggqaljr2NJBJIzEUtezYbe
+VR0bquobnRRiFoyEYL5BhyWtXgHRrJKpsx+XoxNK7df6y3hr3uWj/nshx0JTfSxO
+Kp2jYuZhHSjOPpDIe2vsod1Qe/XpSJ60Yp37ABEBAAG0NVJlbWtvIExvZGRlciAo
+UmVta28gTG9kZGVyJ3MgS2V5KSA8cmVta29ARnJlZUJTRC5vcmc+iQE+BBMBAgAo
+BQJMACZ5AhsDBQkDwmcABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCcdd97
+brjIyJZ6B/0ZKYS5Tb+OI6QRgLOOwv3yoBjgrXCsJ8Fcqa2+gJ1MfK0NZeiofiZQ
+OhH9tGvt76pva8L1LiewbHpRXtbA9DMC7w6eBgECSrud7oGuE+Yd4kOPo1yc+qWQ
+DWBK6OS/MkfPZS12/lNYqxg5EXR3wesaEWPfrJ1VPC3GzRngV2zKxahmoZ4LwwNj
+m16QLg6jf4ltLP+5TPQnIM1ZdBpkOVweegsXbvxhoJUT1jVgueG9F2DuVfDAefKq
+y63IZu1MqendaXCiU5HTnIsGndu6CR89gxMAT7NrjqTN4vp4asOo50Jr91yc4HbH
+CK1shMzwQyWnlSx1/4bYw4iUuVvy0bwruQENBEwAJnkBCACmI3KaRWkpVcxrpt8g
+9LruHRBe2qr6SiuW2kxiUYFJuizKWELVhU1mgBipEsA1T28CkRfGL4LFuG2o3fR0
+5rkEnv4IV8WuYITvleJGbFRr67jfKkZVc/CwfLFwtkTp8EbXQquiKQ/k4eIbM1XO
+wRLdewsUjTPBaml6QjcPYluV+IUmEAbckx2UkN3YKef/DSg3AeCDqSWDGxCz59Vj
+9ia+jiZ22lvLqhNX0iq8sS9YE5N6rW52Y5njraclfZ3qY5FuXNmbzalVmFcRd1Vs
+o2sGGMd8P8L/GLeIwYNVFs6qcwmna9nl+xP6LxYxnJGjJBJF+8FcRA7FTaOARdbH
+9Y9lABEBAAGJASUEGAECAA8FAkwAJnkCGwwFCQPCZwAACgkQnHXfe264yMhjsggA
+taUN/S4of8EB+JV4srLho7s8Hzk2UK11PnWLplIyTZKmJWYTXHQP0L3hL93IRC5I
+Y5lG8bd2znMdAQrGxMxIOKKtYOBCxk6ph0xX4QYDsi3Vx5l7wDPSqCgX8DTyxgoS
+LK6wuLipVtg/dypNMiOJRwcGEKH0SvLjl3klCAK/Q8lEo6K9P99J0LvonBHsSl/h
+7VBH5TKJmuWWBiX9fmFRNE7iuK/dqSgT5Bu9iqlshloQOALofchAKVm0/2B//u/C
+Tb/LgkD2u5rFiqe+Cz9LWwF/CdjRM+1EXwL5C73gTmUkI5tT32cmgRWDlS3gFT1E
+2JwvVAHif+MR5Y2RMTMdyQ==
+=H/lo
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>