diff --git a/share/pgpkeys/vmaffione.key b/share/pgpkeys/vmaffione.key
index 84fe121415..f393cb9bf6 100644
--- a/share/pgpkeys/vmaffione.key
+++ b/share/pgpkeys/vmaffione.key
@@ -1,43 +1,44 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addk.sh vmaffione 2941E976E849FF43 ;
+sh addkey.sh vmaffione D4F93098AA1FA8AA ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   rsa2048/2941E976E849FF43 2018-03-18 [SC] [expires: 2021-03-17]
-      Key fingerprint = 3E3B 1905 113B 9C77 3C87  2F94 2941 E976 E849 FF43
-uid                            Vincenzo Maffione <v.maffione@gmail.com>
-sub   rsa2048/266621AA1953E49B 2018-03-18 [E] [expires: 2021-03-17]
+pub   rsa2048/D4F93098AA1FA8AA 2020-03-10 [SC] [expires: 2023-03-10]
+      Key fingerprint = 7E99 E2AD 9A8B 1C99 A98D  AF2E D4F9 3098 AA1F A8AA
+uid                            Vincenzo Maffione <vmaffione@freebsd.org>
+sub   rsa2048/B51B3033534F9949 2020-03-10 [E] [expires: 2023-03-10]
 
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQENBFquP4QBCACri39S6tArpufdIMb6W0pKMC2UxHxXrTCJj5Ue4ISq/qKztYc0
-qzcQ7a59Yn/ywsD4/0Fx076jEFRnB0bYzwFvjpL/f071vpNMlsRQfXb5mvyp2vfU
-vQICB7ymDlezTlA86zSF6T0un1SpHv+oyYtK20gLtgszuYC8dFE3gMd5PBqrcJTU
-BESvWDftWqW3tO3pNu2mqz4aBWr3GMeXQDUZc+KxkR/CgrrLGXztPzXocCE8qdbj
-Ajc798JyVeZmJpPpvbpme4N9Z/BQRzOHDxfEknWiIKX0fkSO0biBKogHncp0SmJM
-J31DcpoCnqf6TZ1C2hwcasMc3OY9uSX4xAqnABEBAAG0KFZpbmNlbnpvIE1hZmZp
-b25lIDx2Lm1hZmZpb25lQGdtYWlsLmNvbT6JAVQEEwEKAD4WIQQ+OxkFETucdzyH
-L5QpQel26En/QwUCWq4/hAIbAwUJBaOagAULCQgHAwUVCgkICwUWAwIBAAIeAQIX
-gAAKCRApQel26En/Q6K4B/0SaRbx1T7ggGrOYO5rBKwUoy0Oiml2njLji4dQDigS
-Mtih/nMsXV88KQ/9Motswi8+a36aak1ftqoqV2O3ly2oZC+8vrN5v9JJt7L9YrgR
-zlKvCme2hB9gPaJIFaeH/zbYNn7VMRxt9qHiyu2N00LPh5FwYaFir2T7FNleBdbi
-1h1kPzPBXlXW68UXCmYz7bxmdCi/bVed4PwTIob6g4xFwCC5ise92gmffnt+O99u
-fyIWGYySatMOGDdehR75a/Y23i50WmPV1oPlP8Qex/fSVaJoQwcZvwkWkdTQCpv6
-TuJZe9GVSPfF1gdav0fscQiYmvacrmmzmJTzVeNLInu3uQENBFquP4QBCACxDCuO
-Fjbt3DczwNuBbVoCyRFb+ia/8LyPLFxXMF/hInMAbWIOA7P5bzBWO3T3O4eqs2MF
-0kARphOsaTZyyyczQ23a3794evazA7NpFe9bQe4+DrvjdR2wwedNu1sv9DhVrA/Y
-dcnSwlPNPIKx7qxtL6Wst2gQ0rxGQqOjh104kk5Ygng/949NGKxnD1zt8e3ckSIN
-yXWjNvdEDWiQOYHPH0ded/1UA/NnDH6B8MNbySl32PX6Ud6pEUOFb9gD/cM8SP/m
-eOdULWoC2r0ZmWinKZwY3rypslZ287hUvgqcw77ykbEPwz/9G5h7p5UN7KJGgob/
-1JY2g9m8qfFnmVH1ABEBAAGJATwEGAEKACYWIQQ+OxkFETucdzyHL5QpQel26En/
-QwUCWq4/hAIbDAUJBaOagAAKCRApQel26En/Q0cMCACnVJtcJdK/xDkQEGGChKQq
-fnnOKj2a1Do1jyJQr3gyy3lpVD7oOnXcISvzvw+o+p8mdVCDYICJ4Aw60DHnAwk/
-/2qoKzy6fylSxbH5tpPhvmQfvVU4+qhc5Vc6eS8YDkhoELQs/qKS8CB/HH94VeV4
-ySRkKrX0HvEvY6LCrwfAB97KdB+S5O5kGqd9gHH2LOVa+Ew6sVn47xZFAMDF+Tgb
-SL5p5EppaDV221oZtuE2BmMYNv7NUUmTIqmyn9p1t5AmxxWJU4UPAq8H6gVTyYuX
-r3SjF7qo//i9gD4fZot8FNhPoFqU9uTJi6LjFqzXFR7B5Kfb4w4i/yAmJI2jn0Sj
-=z+LK
+mQENBF5oFowBCACgHAkBIXBFGf5dmLWbiSu4BQ1CMi0094l7Ov2d++9gRJBeX/98
+uWPJQTXHyEcexsEXyYmbH191fip7ccuvJiylnj3Sfn2FS11nc0fOMeJUExC22q5/
+LKuW3GfntSkQNd8Pt2F5bRakla20SC9l9ChwVWj+l6dxYXPmTVuIp4WkLc9zjeV3
+IYptvg/2wC5j/tIsbKLdB0ZXcrLQIXqVJIimE28bs1AEmkDfkL89YzPm9YoJeorJ
+yFI66aiUEeFg31H3fNMJ/daN5HVziSPW9WBy3+YLQE8P40Nkj7y4o0JZI6m2eQ9a
+Jm9t09c5HoUjkn+xQ7T2D9pN0JFGcf3Ro+UTABEBAAG0KVZpbmNlbnpvIE1hZmZp
+b25lIDx2bWFmZmlvbmVAZnJlZWJzZC5vcmc+iQFUBBMBCgA+FiEEfpnirZqLHJmp
+ja8u1PkwmKofqKoFAl5oFowCGwMFCQWjmoAFCwkIBwMFFQoJCAsFFgMCAQACHgEC
+F4AACgkQ1PkwmKofqKoFxwgAl6sSiFT/6MQx+6YXWFCH9ysO+eDKCNUwUHIxoHok
+buSHMwywXGo/PmW3j2ga1ZYht/1WP4xftsXCtBUw7ZblovSo3U7HPfbU90etHWcc
+V1Dq1uu7jjXYb9grmIqjXST3kbgJ+b7QJL9HpDU07/1Q+OKIem/2frBjNs6nH6ph
+NN/yZERW4J6gWzSfL3WItwbY6YCh4KcXWRO3rtkAVifBek0xEWmVYAlAXf7aEWhn
+Sm4yLdthbaKU7aKL+yId4rD5zFvZRDPJ2zdGuE5ZuHU5ZJpYPT6OUQAcqFgUMZ6m
+s40kXFK69OkxQnQEhXmZtMSwlpE6pcv4OhA+OxuXPr3mC7kBDQReaBaMAQgAuX0B
++oIg56FYtaVJCGH0YQqTvK8XeEqr3ytD7NFYzZcQoOewDb98DVlHe2Rr/kKRP2vx
+igCATwP2JJIqAHQdYpEEWtXoWQ0PeP92J3j8kPvbK2f089xYFa2sWCmKDuYCPmbF
+66RoDuDtMIM4wl3I/vGw8+4bRXxk+GXcxrfhaKJyYkoPsWS3tSWyuuhdM4XgePOp
++oRR9KyigNaoP/FQFADl3v1sv/jjqXLePPk0OM3NuuIoMOk/01UyR+W2n2c+ShjN
+CKUGkaBXLKFK+Y9aVhHgH5y+TXmAj9FCjGjaT3HXbhfNDcYDMRqXv18Vn+jJKhvC
+1B8ApJgcBmzmDaRJcQARAQABiQE8BBgBCgAmFiEEfpnirZqLHJmpja8u1PkwmKof
+qKoFAl5oFowCGwwFCQWjmoAACgkQ1PkwmKofqKpOEAgAgIoAyyXOsgIfepLHRXlz
+hsDcYUQvayaXryvGAU6FD/nR33ewpY/Qo0GATqHCzGk/1mGJrMBK+7aGUSuZ+9rS
+8EmjbyqzYJwQ/3gq/fSbc0blDl1cTfFQA/wjs4F6U8Txh8SoPkj+VhgRsBnSHdeg
+dLYsYQFIq5Xg9WbsteaIhGEnMy7oLViHG2IbK7A8JFa14Y50LMSzmQCO1Za06B/+
+j4VupRqKxs/7cncp4doSZRT8xA6fVGGswsT8cvXwfGJj5exb6ZJFdzz1c5bRdxdD
+A9KsoJaTqmPeQIsTfwsIkzvLL+/7z8pCVtmaMxRCFFaxD0nJWIpJbViPaWkvcMTt
+OQ==
+=ouk4
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>