diff --git a/share/pgpkeys/keramida.key b/share/pgpkeys/keramida.key
index bd9084f87e..6328de0468 100644
--- a/share/pgpkeys/keramida.key
+++ b/share/pgpkeys/keramida.key
@@ -1,49 +1,131 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh keramida 318603B6;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
 pub   1024D/318603B6 2001-09-21
       Key fingerprint = C1EB 0653 DB8B A557 3829  00F9 D60F 941A 3186 03B6
 uid                  Giorgos Keramidas <keramida@FreeBSD.org>
 uid                  Giorgos Keramidas <keramida@ceid.upatras.gr>
 uid                  Giorgos Keramidas <keramida@hellug.gr>
 uid                  Giorgos Keramidas <keramida@linux.gr>
+uid                  Giorgos Keramidas <charon@labs.gr>
 sub   1024g/50FDBAD1 2001-09-21
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBDuqmfwRBACakPfvtnWVymPgHktoM/fjtoJT49oIkRG6DWXLzr6M6E6ReOAJ
 LCTCo42xgy6vndGb/GUTYIS8JMZSZB0qkTEvPorP70Y0RpD32z+51UYrDtMykohW
 lnTGjSS/+IwT8cTePzu2C+RTAcvlMktOZ4xHRRZHzi6iEZrrok24cRXLSwCgx1/D
 GsEQB415mu3t9REREVaPehkD+gMQ2EYZQSj7ZChSghDR3p8hHvzNmN0MgrxNWSbq
 KID+pO3kBT58SMhOdf206jRAPchoq8aF6Y1h7sZpZCarA1g5M5vomWKdWRde7j4i
 kRsAa5ntUbW1wIQV+cTO2SVcynlP8sZ/1RHapzy4GD3mH1qspJTAKdfSzjNMUMZJ
 zB80A/93O5RBrYqnZUW6TfUbCdSNudb+FYYyEF7/0YFf2BfgCn+HWpp6a9hHgbjM
 zvy4DkkjLu0UjoNeIRGbkLUgZwY0JpMZ1qQZSdQHy13Vt3LkG9I3qnBXqzKRdxQv
 Hl6+vHUIagar1tGZNK6sTvbGt7TRhy8RDLV+wSvU4YTvAGtqWLQoR2lvcmdvcyBL
 ZXJhbWlkYXMgPGtlcmFtaWRhQEZyZWVCU0Qub3JnPohiBBMRAgAaBQsHCgMEAxUD
 AgMWAgECF4ACGQEFAju+Q6EAEgdlR1BHAAEBCRDWD5QaMYYDtn/gAJ0UcfvNt0XL
-oA4TlfYpDdslz2LJewCcDxASNUAzOJcGn6FPUfhol5nzT5u0LEdpb3Jnb3MgS2Vy
-YW1pZGFzIDxrZXJhbWlkYUBjZWlkLnVwYXRyYXMuZ3I+iF8EExECABcFAjuqmoUF
-CwcKAwQDFQMCAxYCAQIXgAASCRDWD5QaMYYDtgdlR1BHAAEB+h8AoI3v1fOoyqR4
-/u72yFxQDEzbUACQAKC66iQb18quWS3QRNcFzbiTI8ifMohGBBARAgAGBQI7rKO8
-AAoJEGHjIVoOe1PRGvcAoKuKIaRiUHnSWzt7SGL7YtQzKHqMAJsGj5pBOcXj82xF
-xfy3hpK7jSu3B7QmR2lvcmdvcyBLZXJhbWlkYXMgPGtlcmFtaWRhQGhlbGx1Zy5n
-cj6IXAQTEQIAHAUCPdQL6QIbAwQLBwMCAxUCAwMWAgECHgECF4AACgkQ1g+UGjGG
-A7ZKTwCfW+//cB8QAM3n3rFthG39VZeMEp0An2AV3OOQaKayX4MMx9Mr5rzGmkzj
-tCVHaW9yZ29zIEtlcmFtaWRhcyA8a2VyYW1pZGFAbGludXguZ3I+iFwEExECABwF
-Aj3UDA4CGwMECwcDAgMVAgMDFgIBAh4BAheAAAoJENYPlBoxhgO2MEsAoMOehdZO
-6Vq06MYhzxLVwGSUSL/NAKC4YjRI3M07BhDNEiBCTTLd6V2kN7kBDQQ7qpooEAQA
-oMOrDFI6w41FpGo1SaaeyF87ItkOZJNOZo05sNGK1xkb0A+/N047+QnoNq1wKp1M
-MJJ6hV5N7BfoWjyqwdR0Au2+EGbyMC3VC3Ttq1fJ5xvQ7L/d5yBePYr2Kci7f8vP
-H7yrsqm12B9MyJa8rTRzIiHT56MZosjaXJEn/rbqOKMAAwYD/3iCHaPl0tihQhDK
-pLLGMpNvFrhrIUnf/AQgN3Ez2VchSJubuTms4ybNsS3jr1cvd4iyoYIqln7iRFMQ
-/BQdgUhkKIOFW0E+wNRRUDob28ed/rz4cR4HEMmOf3uiCw7egrsdou3nkV8gmI42
-w9H5p+/qpxBRJX10xEeLOs/LVCKSiE4EGBECAAYFAjuqmigAEgkQ1g+UGjGGA7YH
-ZUdQRwABAUnQAKCU1zwyCX9rKsiYRORPjK5G1mkVcwCeKAOtsSjWx31CViTq5Z8v
-mEgj0aY=
-=cDvT
+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
+=6KNQ
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>