diff --git a/share/pgpkeys/remko.key b/share/pgpkeys/remko.key
index 66858a7174..9cffb23eb2 100644
--- a/share/pgpkeys/remko.key
+++ b/share/pgpkeys/remko.key
@@ -1,44 +1,45 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh remko 8F494B77;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024D/8F494B77 2004-09-03 Remko Lodder (my FreeBSD.org uid) <remko@FreeBSD.org>
-     Key fingerprint = 575D 8AD6 8646 E6D2 1226  0A8C D2A9 0DFF 8F49 4B77
-uid                            Remko Lodder (Remko Lodder) <remko@elvandar.org>
-sub  2048g/D843AEDD 2004-09-03 [expires: 2005-09-03]
+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]
 ]]></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
-WlbRyaMTkARVJ6NTU6wFChvS7WTHwApo7dUJJEYNSYkggksiGrQwUmVta28gTG9k
-ZGVyIChSZW1rbyBMb2RkZXIpIDxyZW1rb0BlbHZhbmRhci5vcmc+iF8EExECAB8F
-AkE4vPoFCQHhM4AECwIHAwMVAgMDFgIBAh4BAheAAAoJENKpDf+PSUt3EscAn3iv
-MzGhinK3kmaysN5MCcLFI+DmAJ9Uc8sLwL+sGpAVaD5ETN7RQ9zmZ7Q1UmVta28g
-TG9kZGVyIChteSBGcmVlQlNELm9yZyB1aWQpIDxyZW1rb0BGcmVlQlNELm9yZz6I
-ZAQTEQIAJAUCQXBYRAIbAwUJAeEzgAYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRDS
-qQ3/j0lLd2BwAKCqTX62b2I+XEMoL7pqs9UO+v7SxwCgyTfd/k0UyBlfefZHIQbO
-imSAT/y5Ag0EQTi9CRAIAPuPdKJu0sPXK55CMvYS1p1/5HxOsuO06WF1KJGssx0N
-4aaaxnzNT/b/dFU2DgrczZei/6Ln8Q8IXmtb3fwH6JarVKFx9R0GVwi/kNhrSpca
-+TwK7pMOmCx1NGRamqxXwFydQRry5JmIL22+0gQ8Mth5hxZ8I5jUjhy0SHljoaOi
-TtEn6jFRQKrljEXfJhw+PGT2++VllHxnekxYbBVNEU9WrjtiP6ViOLnIETXiXBg2
-JpUopMiIfM3sDwTTdSSwxAo3blKpIZuo5gqpa4tEG/RcZjcRkSJvsvw/HV4aq2AY
-tlQuqlTu63lTj1ymNXxK0n25wH32AH3vCDSFauJ+o/cABA0IAKq3UIeAct1raNxC
-SONxWDxpHD7YZ5WXex4dpBx+tQOiRgcLHjdIscIcwEaiL+/pzqOHaaux5h3Co9l1
-K5dJ4y9f5kHaJNqzt0mcyp6iZXuHMLfymUBF8KF5+BDxtaMO0GrQOkIf3YWO5ClE
-4C4pDAsCpcJ5Ai+t1lzDZjSN6Krw4UCJCAumZPOz95tRbVp77rfcO4AGfKJUTRXS
-5RDaQ5VpaHmMJDkZ2YXDgVrxFRWS8Rw70ZeY7Cc2y88SUMsu42tD+VxVwXJfHz7c
-EMn0DTkc+gP3+V3cholsHAyyCn22nnX02HUdE2v0jbUiZljMEbQVGqevA9lilGw+
-kfKNGLiITAQYEQIADAUCQTi9CQUJAeEzgAAKCRDSqQ3/j0lLd6oDAJ4m+MR+7nKJ
-l8wGWZ84BsiFS/2OvgCgouIxlC0t78kXgBz3zjM5oOYtfCc=
-=QVjz
+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
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>