diff --git a/share/pgpkeys/matteo.key b/share/pgpkeys/matteo.key
index 1dcd5f649e..07a9e7cbcf 100644
--- a/share/pgpkeys/matteo.key
+++ b/share/pgpkeys/matteo.key
@@ -3,7 +3,7 @@
 sh addkey.sh matteo 1EC56BEC;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   1024D/1EC56BEC 2003-01-05 [expires: 2008-09-19]
+pub   1024D/1EC56BEC 2003-01-05 [expires: 2009-09-07]
       Key fingerprint = F0F3 1B43 035D 65B1 08E9  4D66 D8CA 78A5 1EC5 6BEC
 uid                  Matteo Riondato (Rionda) <matteo@FreeBSD.ORG>
 uid                  Matteo Riondato (Rionda) <rionda@riondabsd.net>
@@ -12,7 +12,7 @@ uid                  Matteo Riondato (Rionda) <matteo@riondato.com>
 uid                  Matteo Riondato (Rionda) <rionda@riondato.com>
 uid                  Matteo Riondato (Rionda) <rionda@FreeSBIE.ORG>
 uid                  Matteo Riondato (Rionda) <rionda@autistici.org>
-sub   1024g/A040570C 2003-01-05
+sub   1024g/A040570C 2003-01-05 [expires: 2009-09-07]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -27,8 +27,8 @@ eH8ZBACFEieAhOsM7XC4MJJqxuwnFLBLmSPwaJZs5CfRxmnRp+up1Ez/aN4k7b/r
 rl0dpCLOcQ+sI9rikJm3Rkkdlo23UQb9kq1a9FDEUjkfz/sR9RIlxUbaOaGBEJaB
 OItFpjXMKKeYqKVbvP7PBmJz4jIim3igre8FxwGbmk3YDW1w97QtTWF0dGVvIFJp
 b25kYXRvIChSaW9uZGEpIDxtYXR0ZW9ARnJlZUJTRC5PUkc+iGcEExECACcCGwMG
-CwkIBwMCAxUCAwMWAgECHgECF4ACGQEFAkbySp4FCQq7S+UACgkQ2Mp4pR7Fa+wZ
-PACfevfrVK+lGi2HF7EFmXiHSeoQ83EAnjfzxq3OTEZIu12R6dS8KGbHGRjSiQJI
+CwkIBwMCAxUCAwMWAgECHgECF4ACGQEFAkjD9ZQFCQyM9tsACgkQ2Mp4pR7Fa+yZ
+qACgzwsIoKTfHGpSUKAGKqbdqvnQcDQAoKjMIdxEitUR80oJxwcRfr7LF0HFiQJI
 BBABAgAyBQJFVbmJKxpodHRwOi8vd3d3LnBhZXBzLmN4L2dwZy9zaWduaW5nLXBv
 bGljeS5hc2MACgkQJknmKMXTTQWxxxAAgHEDKMojm0Ri4FjGuXcIuF4lcIRzm9Y8
 fRfQA9whGfcrFbcJ6D3JzTqk70lc1bs4aE1ApBGgLKGk67m5RzK0yFoNw2iqgUma
@@ -42,9 +42,9 @@ YAtpq/NJYqoAbvu81bddTqRCZN5gIfKfrYWreYWEDawQVGxET7/LnJMDAgXlRj+i
 qSsjP9tKlrr1LowfNdM8JEJvdsLVRlTloyAG6UzyiCpEycPhSy/pyzfbIGz/FpFs
 rvCzkUk+FQvXt9u0zmzmoOC/HFkqk3SNIOMkKpg28KCvbsyMdnv953L7EVLqcQDX
 zWxZ5UeKnbW0L01hdHRlbyBSaW9uZGF0byAoUmlvbmRhKSA8cmlvbmRhQHJpb25k
-YWJzZC5uZXQ+iGQEExECACQCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkbySqMF
-CQq7S+UACgkQ2Mp4pR7Fa+wMYACbBLQZlgUtb93h7HhziBKj+NbBoPIAoMJAvSGF
-Ve/2B1cyXxpSkx9a63veiF4EExECAB4FAj+S3TsCGwMGCwkIBwMCAxUCAwMWAgEC
+YWJzZC5uZXQ+iGQEExECACQCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkjD9ZQF
+CQyM9tsACgkQ2Mp4pR7Fa+x3nACfS8MclqZjF3c//jtm24brLPMlw7EAoMtB1wMg
+WSFg0nJpHW0BMENnoIVTiF4EExECAB4FAj+S3TsCGwMGCwkIBwMCAxUCAwMWAgEC
 HgECF4AACgkQ2Mp4pR7Fa+yRagCdHcaj5oQFCv83U4TS4nVKibpkocQAoMBsgZpG
 zD6ri2FV0s2WykTXD8HciEwEExECAAwFAkJveugFgwDghfcACgkQymi72IiShytp
 jgCg22Fo57NbaMAtspNIK/jmmsqPpFIAoO71KJGE9W/PceZcXKOKyjyFeIJhiF4E
@@ -68,8 +68,8 @@ wIpXULF1ISRbtKdxiVINQD6+y5SamZPYJwysbmScbHwUu39Y8zQa00PxF/pw+Xve
 yeRrrCnijRPfYJlDHQSvNUu+texd1aix0mK3T92LAcI26uFBGVJvfZ5gJTLB53gb
 tgktN+t3kcTmnvGjVJ37+DGlpTK0Kk1hdHRlbyBSaW9uZGF0byAoUmlvbmRhKSA8
 cmlvbmRhQGd1Zmkub3JnPohkBBMRAgAkAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheA
-BQJG8kqjBQkKu0vlAAoJENjKeKUexWvs59IAn0tZPGloXvFLMhQHxbqYhVXJkVPz
-AJ0W89l12gTGlB+MnQeC1VchQBgTqoheBBMRAgAeBQI/kq+KAhsDBgsJCAcDAgMV
+BQJIw/WUBQkMjPbbAAoJENjKeKUexWvsAFMAoJJ+sFZ9LVo9daku1VnN5rzH4A4H
+AJ92iWh2Ada+1roEKvJcEr4ro80RroheBBMRAgAeBQI/kq+KAhsDBgsJCAcDAgMV
 AgMDFgIBAh4BAheAAAoJENjKeKUexWvsWr8AoMQFD7462JRnnXg2caQ7G3EP9hgy
 AKCayAdgWjzEbAJbcOYNfudR4V6uz4hMBBMRAgAMBQJCb3roBYMA4IX3AAoJEMpo
 u9iIkocrhV8AoN4CvGLukd5oJNCfHT6uZvXqmAKmAJwNFLS2ESp/hZpC5DuB6xHW
@@ -93,8 +93,8 @@ OZ/ZzlefpdLs7QIPhVew9J4i6vsGnJKIxaWfSb/0D4QyxTbs+pORmZn1dTqYkxYT
 m9B6/Bz3SsZX4DrOIJEp/yHKN+qIH73/7cHL9H8PcX6q/q5n6GyIPAbz3aPKr/ec
 Y5Q0DP7gGItSTAzpjfls1dps/DTq/YvHBsrltC5NYXR0ZW8gUmlvbmRhdG8gKFJp
 b25kYSkgPG1hdHRlb0ByaW9uZGF0by5jb20+iF8EExECAB8ECwcDAgMVAgMDFgIB
-Ah4BAheABQJG8kqjBQkKu0vlAAoJENjKeKUexWvsK3QAoMZl84gOxoWEN9yCxDKi
-wWfwwbO2AJwJIJTsmvJWMqN8O67ykXLUE3B6ZohGBBMRAgAGBQI/OBUqAAoJECGd
+Ah4BAheABQJIw/WUBQkMjPbbAAoJENjKeKUexWvsITQAniOhCzzuckh3gtiX7v/C
+FONc9l2qAJ4/TKa95fVFsC7O/WhlPMGmIF6O6YhGBBMRAgAGBQI/OBUqAAoJECGd
 tTlfS2RLHnYAnjevlZGhqb0TGiwacsVa0kP8fTXFAKDFtE8lcNjmPoFUsY3Jd29S
 YZmBXohGBBMRAgAGBQI/OMYJAAoJEBcHKSX3WQ6BYkIAnRyaV9rOSacwSmiJqsG2
 JogEc+5qAJ45G4hGEZ+M3PF50B9TdlNChe1/cohGBBARAgAGBQI/OVROAAoJEMB3
@@ -122,8 +122,8 @@ O6onFmemVfStgfww7jRifnpeD3jWKicgL7PY6k39Lsn1WTBHXrCM3nIfHGn6toKd
 oPMUsf7tCKcjEcdpzWih1lEbBwRK9GExXeKw3FtEToJJtyCEWVIaWPR4js86/NwQ
 OhWpIZqYLaGMy3OtNdTYfvDSKQmoOhfU9Ma1MdgFreifHUYrO7QuTWF0dGVvIFJp
 b25kYXRvIChSaW9uZGEpIDxyaW9uZGFAcmlvbmRhdG8uY29tPohkBBMRAgAkAhsD
-BgsJCAcDAgMVAgMDFgIBAh4BAheABQJG8kqjBQkKu0vlAAoJENjKeKUexWvs02wA
-oInfOAKEsujbPvxHyAoNefHdiNY2AKCVtKm6Vjqri0BeL/h8Zj7TlbwbJYheBBMR
+BgsJCAcDAgMVAgMDFgIBAh4BAheABQJIw/WUBQkMjPbbAAoJENjKeKUexWvsVqEA
+oNT2BBwdKO74o2weXjTctdDUs6ovAKC8UZqrlCSb0Ynflka0ivRkgbHvu4heBBMR
 AgAeBQI/krBsAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJENjKeKUexWvsfGoA
 nAvDjfIQkf5x9in89dp9VXfRmSZNAJ9QApyIuk13CyHMPDqxhqlQM0s7TYhMBBMR
 AgAMBQJCb3roBYMA4IX3AAoJEMpou9iIkocrkfcAoJUuC5O3oOh9dEj1eSjRa4TL
@@ -147,9 +147,9 @@ rz45OqjZuybGQash/DTt2rdfnEDHn5Syf9hscAf6cg0b8b9ORrd4MdZ5fYOP61F2
 JY22KVAf72PYxEUPsjMxXDXWyqV0AgCecbM8Vv5NEaMqxtSK1idlD4f70TXyighn
 5Gdq0Fr+jbGLp3dkYxZCxrkBTIJIMCuiEStQZ78y68nNE9ThIoxIORQR5KmNXBjN
 tC5NYXR0ZW8gUmlvbmRhdG8gKFJpb25kYSkgPHJpb25kYUBGcmVlU0JJRS5PUkc+
-iGQEExECACQCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkbySqQFCQq7S+UACgkQ
-2Mp4pR7Fa+zQIQCgrG4nyUqDXlwZcM4EBJ2P7oUv81cAoNa2aYB53U4FQi2gI0Bj
-5fttZQlWiQJIBBABAgAyBQJFVbmKKxpodHRwOi8vd3d3LnBhZXBzLmN4L2dwZy9z
+iGQEExECACQCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkjD9ZQFCQyM9tsACgkQ
+2Mp4pR7Fa+yzMwCfdBfEgoXhW4JUamVMcj2upNKIoYQAn3pn4ZJkuY0aBymo4p8t
+OZVFxUH5iQJIBBABAgAyBQJFVbmKKxpodHRwOi8vd3d3LnBhZXBzLmN4L2dwZy9z
 aWduaW5nLXBvbGljeS5hc2MACgkQJknmKMXTTQXp8g/+I154/0tWtidEDAS5cYZJ
 ywFGY2LLjmCrT5AKktJfGJ4/YnlZXsxsS57iMRDSJ9mvKgMwwd/iHvJI6m0cXws+
 ZDyij4nYYk+48//MNPkhbe6s/3ttaEwAT5OZL1CZ9YY44GGsWDEndgDhMvdZudWU
@@ -172,9 +172,9 @@ iGQEExECACQCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAj+T9xQFCQNc+FgACgkQ
 2Mp4pR7Fa+yNhgCfV46eWVAYlCl2d70JQtkx7RGzwFIAniU8lKj6gqc7CJbf2fQl
 MDmic0qXiGQEExECACQCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkF1ZN8FCQU3
 zqYACgkQ2Mp4pR7Fa+ycEACeN1Gu3C7DgloRXTx/pdJg5k8T1bsAniDNS1BHtKvs
-1fAcj//3zOJiaOQsiGQEExECACQCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkby
-SqQFCQq7S+UACgkQ2Mp4pR7Fa+xMxwCg2fS7iw7ma8MLNEKpl/LiF/j5f2wAniU5
-ZIi1EBdSmYS2K2CXe+1fJQc+iQJIBBABAgAyBQJFVbmKKxpodHRwOi8vd3d3LnBh
+1fAcj//3zOJiaOQsiGQEExECACQCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkjD
+9ZQFCQyM9tsACgkQ2Mp4pR7Fa+wbhgCgyKBWjk+pZz6uO1ANDxuK6T8t8NAAoMHK
+byO8GMTA0g5sOSu12KIBeT+oiQJIBBABAgAyBQJFVbmKKxpodHRwOi8vd3d3LnBh
 ZXBzLmN4L2dwZy9zaWduaW5nLXBvbGljeS5hc2MACgkQJknmKMXTTQUmOQ//R9AF
 t1oVlCDWvnZglRBHnhDmmuRGBiZo5xVVLBXLW6Fh0OJjdfTkad1zMI02JxwAqrEw
 PUODmlsDGOJdGuRSA0J7pVFj7frld/xhFHSykrZFuTjRyLqSETQ4kdwRGyUsc/x6
@@ -192,8 +192,8 @@ fbMHkpIWtNv4hmyp0tiNBKes4ZEU2n5v/6mIfucinb1/dlOAZ9A2Vt8ENvCv4LlX
 G2cO+BXWX4rUCuw/IBgEwDbyQ9UlJ/sHAAMFA/9MpblWU1tWOBEvj6EGiKglizo4
 PoWWlCPOmszeajjq36qinjf6MSU1mjVD6VZmJtQJ1cRJ4/SFP3lc2BfwgdKGy7Zi
 Y083WueT7DBD0sbHRL9d9OBJKyjPl/sgs9Lq8uqYmqoEbjjasI98AuLq37FXCQwz
-zAbR4UIzMqiJZLseL4hGBBgRAgAGBQI+GDI6AAoJENjKeKUexWvsmBoAn3+rzz5A
-2dHLRi6GSO3ewVr81E5hAKC8A34OSriV6EA60sWrLIz1hwzVEQ==
-=budv
+zAbR4UIzMqiJZLseL4hMBBgRAgAMBQJIw/YTBQkMjPdZAAoJENjKeKUexWvsBLoA
+oIMGU493aEexi26Wv1Wo3NtSHaZ5AJ4tgy8kRxJ/NYcMUBES/sgQr17ZnA==
+=uPdL
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>