diff --git a/share/pgpkeys/matteo.key b/share/pgpkeys/matteo.key
index 9ece00ce68..78df042361 100644
--- a/share/pgpkeys/matteo.key
+++ b/share/pgpkeys/matteo.key
@@ -1,74 +1,60 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh matteo 1EC56BEC;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   1024D/1EC56BEC 2003-01-05
+pub   1024D/1EC56BEC 2003-01-05 [expires: 2007-09-16]
       Key fingerprint = F0F3 1B43 035D 65B1 08E9  4D66 D8CA 78A5 1EC5 6BEC
-uid                  Matteo Riondato (Rionda) <rionda@FreeSBIE.ORG>
+uid                  Matteo Riondato <matteo@freebsd.org>
 uid                  Matteo Riondato (Rionda) <rionda@riondabsd.net>
-uid                  Matteo Riondato (Rionda) <rionda@autistici.org>
 uid                  Matteo Riondato (Rionda) <rionda@gufi.org>
 uid                  Matteo Riondato (Rionda) <matteo@riondato.com>
 uid                  Matteo Riondato (Rionda) <rionda@riondato.com>
-uid                  Matteo Riondato (Rionda) <matteo@FreeBSD.ORG>
-sub   1024g/A040570C 2003-01-05
+uid                  Matteo Riondato (Rionda) <rionda@freesbie.org>
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBD4YMjkRBADOT7Ua8/jbuJnPDzHt/HQu07sfRHZbf+WmX72K58Tpjz3kswox
 +3LpnqZf2B0s8PZzLkeFBH0fdSybFT27CnQ6YrMhYM4rM+VyN035xmnvAWmkiYp/
 iyTYWFS6hHRy0hGZYDcSUHou7xfoHCF7bl7hsONArYadf9yS9v/NYlfrewCg3NDN
 X9gtr5/3LC52PYscMIwG4F8EAMJe84ycNFvlcuwiO1BPESKrYjD++8pidYGk66iA
 FjOMUBtcbgQ3QBu9/lOM8S6DHa1Cs12nvbibZJtURy7IJxCEv0MepJBWPNimoHz0
 hxV3ZF/BIulRre5RZ+pFpeYCKXVge3iQ/okjuKHod/VnHrxEXjWw0LQYWNyQHUZt
 eH8ZBACFEieAhOsM7XC4MJJqxuwnFLBLmSPwaJZs5CfRxmnRp+up1Ez/aN4k7b/r
 rl0dpCLOcQ+sI9rikJm3Rkkdlo23UQb9kq1a9FDEUjkfz/sR9RIlxUbaOaGBEJaB
-OItFpjXMKKeYqKVbvP7PBmJz4jIim3igre8FxwGbmk3YDW1w97QvTWF0dGVvIFJp
-b25kYXRvIChSaW9uZGEpIDxyaW9uZGFAcmlvbmRhYnNkLm5ldD6IXgQTEQIAHgIb
-AwYLCQgHAwIDFQIDAxYCAQIeAQIXgAUCQ5GMIwAKCRDYynilHsVr7JcvAKDAqlvT
-XaC7TxoBAYZ1fQgivvOs9wCcCT0nphYwPLtuZd+cC7uLK6mO9rOIXgQTEQIAHgUC
-P5LdOwIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRDYynilHsVr7JFqAJ0dxqPm
-hAUK/zdThNLidUqJumShxACgwGyBmkbMPquLYVXSzZbKRNcPwdy0L01hdHRlbyBS
-aW9uZGF0byAoUmlvbmRhKSA8cmlvbmRhQGF1dGlzdGljaS5vcmc+iF4EExECAB4C
-GwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkORjCcACgkQ2Mp4pR7Fa+z0TgCfUJ6Q
-juOAmFbmPFyhuj+ZvKY9i24AoIP7KXnjHB9RHCgu875J6BcddZCPiF4EExECAB4F
-Aj+SsIoCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ2Mp4pR7Fa+zkIQCgqEU9
-XCBikHsADZ/U1zSzXnV0g6UAoIBNduGdRhi6rzB5N7DvLCX/kpCItCpNYXR0ZW8g
-UmlvbmRhdG8gKFJpb25kYSkgPHJpb25kYUBndWZpLm9yZz6IXgQTEQIAHgIbAwYL
-CQgHAwIDFQIDAxYCAQIeAQIXgAUCQ5GMJwAKCRDYynilHsVr7KrFAKDCTs0y2gYy
-BNCkB4WyafGdCuw8FQCdFl7JoriMsogzMIKla6d52/Nrw9yIXgQTEQIAHgUCP5Kv
-igIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRDYynilHsVr7Fq/AKDEBQ++OtiU
-Z514NnGkOxtxD/YYMgCgmsgHYFo8xGwCW3DmDX7nUeFers+0Lk1hdHRlbyBSaW9u
-ZGF0byAoUmlvbmRhKSA8bWF0dGVvQHJpb25kYXRvLmNvbT6IWQQTEQIAGQQLBwMC
-AxUCAwMWAgECHgECF4AFAkORjCgACgkQ2Mp4pR7Fa+zCUgCg14T+K5reEK2My/D8
-FyAeAl+WUewAoMv8qnGVp7UWwNuez3F1zx+mW6QMiEYEExECAAYFAj84FSoACgkQ
-IZ21OV9LZEsedgCeN6+VkaGpvRMaLBpyxVrSQ/x9NcUAoMW0TyVw2OY+gVSxjcl3
-b1JhmYFeiEYEExECAAYFAj84xgkACgkQFwcpJfdZDoFiQgCdHJpX2s5JpzBKaImq
-wbYmiARz7moAnjkbiEYRn4zc8XnQH1N2U0KF7X9yiEYEEBECAAYFAj85VE4ACgkQ
-wHcD0+DrBtTrHgCgsQf5rmjd/xWBrMqyzE6j91YA1CwAn0xvum9Ys7zRT34Z6eTg
-+l/VDQ07iFkEExECABkFAj4YMjkECwcDAgMVAgMDFgIBAh4BAheAAAoJENjKeKUe
-xWvsX/MAoLXc3hNgh9FoOt171tWy3IWa6PV/AKDaudASV+5fnSqjjS5QePJz1Vb6
-CLQuTWF0dGVvIFJpb25kYXRvIChSaW9uZGEpIDxyaW9uZGFAcmlvbmRhdG8uY29t
-PoheBBMRAgAeAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheABQJDkYwoAAoJENjKeKUe
-xWvsLe4AoNosKkNksqXhyibrBRFoXKeShvngAJsG3JbaSNkEaGAlRjANxb53RgOF
-7oheBBMRAgAeBQI/krBsAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJENjKeKUe
-xWvsfGoAnAvDjfIQkf5x9in89dp9VXfRmSZNAJ9QApyIuk13CyHMPDqxhqlQM0s7
-TbQtTWF0dGVvIFJpb25kYXRvIChSaW9uZGEpIDxtYXR0ZW9ARnJlZUJTRC5PUkc+
-iF4EExECAB4FAkORjFICGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ2Mp4pR7F
-a+xVkACfWaz0hKh6ylUNodu6ncBU+ru1mN0AmwTYGMfZc1ApQ3EfEzAhb+8J1eo2
-tC5NYXR0ZW8gUmlvbmRhdG8gKFJpb25kYSkgPHJpb25kYUBGcmVlU0JJRS5PUkc+
-iF4EExECAB4FAkORjGsCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ2Mp4pR7F
-a+wLLwCggclsHCsssTvZyrAsfD6Y/YxEhH4AoMO1GBlyuxX8hk0jg1lPWNeHBW4p
-uQENBD4YMjoQBAC4+65nQmqzD2co18WLQuT7box6NiSqLyZxBX/99tLISOLnpJsF
-s6Q+8MCmeSv9JBFaUrJXokcJdn2zB5KSFrTb+IZsqdLYjQSnrOGRFNp+b/+piH7n
-Ip29f3ZTgGfQNlbfBDbwr+C5VxtnDvgV1l+K1ArsPyAYBMA28kPVJSf7BwADBQP/
-TKW5VlNbVjgRL4+hBoioJYs6OD6FlpQjzprM3mo46t+qop43+jElNZo1Q+lWZibU
-CdXESeP0hT95XNgX8IHShsu2YmNPN1rnk+wwQ9LGx0S/XfTgSSsoz5f7ILPS6vLq
-mJqqBG442rCPfALi6t+xVwkMM8wG0eFCMzKoiWS7Hi+IRgQYEQIABgUCPhgyOgAK
-CRDYynilHsVr7JgaAJ9/q88+QNnRy0Yuhkjt3sFa/NROYQCgvAN+Dkq4lehAOtLF
-qyyM9YcM1RE=
-=er31
+OItFpjXMKKeYqKVbvP7PBmJz4jIim3igre8FxwGbmk3YDW1w97QkTWF0dGVvIFJp
+b25kYXRvIDxtYXR0ZW9AZnJlZWJzZC5vcmc+iGkEExECACkCGwMFCQjVOtEGCwkI
+BwMCBBUCCAMEFgIDAQIeAQIXgAUCRQw55QIZAQAKCRDYynilHsVr7K4fAKClNYCn
+3fLzpvbCtgQq7dOQ6xBQIgCgmRc0FejPpgd8y+lOkodd0ZrfoUC0L01hdHRlbyBS
+aW9uZGF0byAoUmlvbmRhKSA8cmlvbmRhQHJpb25kYWJzZC5uZXQ+iGQEExECACQC
+GwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkUMOYoFCQjVOtEACgkQ2Mp4pR7Fa+z4
+cQCgxNHsRHfMet0/T0L7sHdCzQPz5SoAoJypWkI60fbQMlA538Cf/6O0ZRweiF4E
+ExECAB4FAj+S3TsCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ2Mp4pR7Fa+yR
+agCdHcaj5oQFCv83U4TS4nVKibpkocQAoMBsgZpGzD6ri2FV0s2WykTXD8HctCpN
+YXR0ZW8gUmlvbmRhdG8gKFJpb25kYSkgPHJpb25kYUBndWZpLm9yZz6IZAQTEQIA
+JAIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAUCRQw5jgUJCNU60QAKCRDYynilHsVr
+7OggAKCJKJMScmkqDRZcAm6EKHV5bthkSgCfXz1COM0S93aTJicMHfkxNAYtLmSI
+XgQTEQIAHgUCP5KvigIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRDYynilHsVr
+7Fq/AKDEBQ++OtiUZ514NnGkOxtxD/YYMgCgmsgHYFo8xGwCW3DmDX7nUeFers+0
+Lk1hdHRlbyBSaW9uZGF0byAoUmlvbmRhKSA8bWF0dGVvQHJpb25kYXRvLmNvbT6I
+XwQTEQIAHwQLBwMCAxUCAwMWAgECHgECF4AFAkUMOY4FCQjVOtEACgkQ2Mp4pR7F
+a+zuawCfTddrW2JZ45WAj5CyeghI8f1YGj0AoJRpat2C95mr7qJmvQ+7IlCQA6yy
+iEYEExECAAYFAj84FSoACgkQIZ21OV9LZEsedgCeN6+VkaGpvRMaLBpyxVrSQ/x9
+NcUAoMW0TyVw2OY+gVSxjcl3b1JhmYFeiEYEExECAAYFAj84xgkACgkQFwcpJfdZ
+DoFiQgCdHJpX2s5JpzBKaImqwbYmiARz7moAnjkbiEYRn4zc8XnQH1N2U0KF7X9y
+iEYEEBECAAYFAj85VE4ACgkQwHcD0+DrBtTrHgCgsQf5rmjd/xWBrMqyzE6j91YA
+1CwAn0xvum9Ys7zRT34Z6eTg+l/VDQ07iFkEExECABkFAj4YMjkECwcDAgMVAgMD
+FgIBAh4BAheAAAoJENjKeKUexWvsX/MAoLXc3hNgh9FoOt171tWy3IWa6PV/AKDa
+udASV+5fnSqjjS5QePJz1Vb6CLQuTWF0dGVvIFJpb25kYXRvIChSaW9uZGEpIDxy
+aW9uZGFAcmlvbmRhdG8uY29tPohkBBMRAgAkAhsDBgsJCAcDAgMVAgMDFgIBAh4B
+AheABQJFDDmOBQkI1TrRAAoJENjKeKUexWvsMv0AnizCKcaPMdkkL7l58fmyf1vu
+Tj1VAKCnuDd5bRVMsnjItnJz3b459UE36YheBBMRAgAeBQI/krBsAhsDBgsJCAcD
+AgMVAgMDFgIBAh4BAheAAAoJENjKeKUexWvsfGoAnAvDjfIQkf5x9in89dp9VXfR
+mSZNAJ9QApyIuk13CyHMPDqxhqlQM0s7TbQuTWF0dGVvIFJpb25kYXRvIChSaW9u
+ZGEpIDxyaW9uZGFAZnJlZXNiaWUub3JnPohmBBMRAgAmBQJFDFOFAhsDBQkI1TrR
+BgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ2Mp4pR7Fa+wH1QCg1sAcddNu9115
+8VofCHM0pkAHbRwAniMYWxAmDbBM9oJLXtgZ/ng9j3j7
+=5DFq
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>