diff --git a/documentation/static/pgpkeys/salvadore.key b/documentation/static/pgpkeys/salvadore.key
index bc93ede056..c40a687d51 100644
--- a/documentation/static/pgpkeys/salvadore.key
+++ b/documentation/static/pgpkeys/salvadore.key
@@ -1,46 +1,76 @@
-// sh addkey.sh salvadore 4F61AC5186F9AC20 ;
+// sh addkey.sh salvadore B58F7C3CF6DB8A38 4F61AC5186F9AC20 ;
 
 [.literal-block-margin]
 ....
+pub   rsa2048/B58F7C3CF6DB8A38 2022-04-03 [SC] [expires: 2025-04-02]
+      Key fingerprint = 1260 B72E 4D63 6F9E 0EBC  FB08 B58F 7C3C F6DB 8A38
+uid                            Lorenzo Salvadore <salvadore@FreeBSD.org>
+sub   rsa2048/058D487E056795FE 2022-04-03 [E] [expires: 2025-04-02]
+
 pub   rsa2048/4F61AC5186F9AC20 2019-12-25 [SC] [expires: 2022-12-24]
       Key fingerprint = 75F0 E0FE C914 D646 0498  CAD3 4F61 AC51 86F9 AC20
 uid                            Lorenzo Salvadore <salvadore@FreeBSD.org>
 sub   rsa2048/A4A5DE173430F950 2019-12-25 [E] [expires: 2022-12-24]
 
 ....
 
 [.literal-block-margin]
 ....
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQENBF4D5PMBCACzyDg1oTp+NbE2o5VUJiqNWGbMXgAVDTxVw6ArmS4xtjSPvcXA
-djna2sPiyzjMJiT+eYAxvipg24wWLkeXuJxlb6fn3dMqZCgkJ77K9Bipi9WSH7kk
-L87+pKOy7xJ4EXgEgTj6v38ABFi2lCCZjjAJR3hafJq1FiSlBp6oP8Jw5ITmn156
-vfi23yZQ1+xMfZX5s1NsLtSB7/4vSPxMyvKf6ARZmo7dc0RVqbCSJyyFFOEAoIBk
-vczUVidQ7B6LM/nz6WM0LpCkuXVKaH0uKLDqLw4v9rFXaUs8du9QRSzNkuGM4qpo
-T2PGtgsD/jChlydgqn+wIMTMO1hB820jlWBHABEBAAG0KUxvcmVuem8gU2FsdmFk
-b3JlIDxzYWx2YWRvcmVARnJlZUJTRC5vcmc+iQFUBBMBCgA+FiEEdfDg/skU1kYE
-mMrTT2GsUYb5rCAFAl4D5PMCGwMFCQWjmoAFCwkIBwMFFQoJCAsFFgMCAQACHgEC
-F4AACgkQT2GsUYb5rCDrSQf+NkS2pLSM4vKNQYCUIzoyZI0wvfyNqSHGDwCgRWn0
-SLeLyV9I8KUpDvWvEF+mzQQQVMzqKlaArs+z4IWkP7hM0mE//CXxt9OVlvuYa+na
-pDyMg9WfRZne5VxYBIQJg9MR/cz5b5t/J/SMhdEcxXPBo0ykgK8DnoeK/Qk7yyWx
-KX+zudf+VypRGhZUeN8IwaEntkq0u+qbc20bILY35/9KK8zWq4g3XaXblbMIVnTb
-eyFWn54+jk6C1qRV6/1D/xoXpMnRDk31Svc0RIADxm086D4EdIywZRgj5LUsviEG
-H9J5orqcWg4d5k1/eQBIU3yr8OiqEt9PIVUomFpphQsJY7kBDQReA+TzAQgA3xtY
-s5smz0ZbltdGSmbKwsLSAMbyLuyK8u5JYJ91LvrUZ8Mk/eIiqOYGjH0oPwI9kScY
-wuQgfTOZuegov7kd7UYdfJFv15UKJa1YdZj36rBariC7BfI4dyU+02UbcTqMKHCB
-DHcjjaQ3hgXIhDjBxFxkD2oiAcJv/PT2YUlFLQvxA2/tBBR1Zm3telxHdWTtbror
-BnNb9O7fxLsE/R3iKg+NNL7eznSd8iA4J5rQ5zDPZtIN77UTFPXNOj/uqqyouAS5
-WvvQilKxIqiUl9KswfZ+aG45BDQ2Aq6iG0w31F0jbJ5Ai2whQHmkS8Ypdr73ZbCY
-ya4U3pvWjnPjwlrr0wARAQABiQE8BBgBCgAmFiEEdfDg/skU1kYEmMrTT2GsUYb5
-rCAFAl4D5PMCGwwFCQWjmoAACgkQT2GsUYb5rCCfMAgApxG2+eRro6hV8Xss2qMw
-/MiV6kAD/XYJVWGQar/tYrJp7oHZwLuPa82yI7n1Aq+SGxROJ+OCpqzEtTF4jFsh
-Ebvkf7LckcBsrvbW1G2QXJFAvwBq8Dx7T1FK6rSw4F2dFP0/G17cbbPCS1vS2aMs
-kZi2o/hVAhU9/iS91mzTaTRlm5jqYZtk/mK1GB0MC+1bQxKoKiel9UI+o2vz5Lg8
-NJnCcvvFkueG1VivQDt+S/anOGQd8/H0bZNSiwsZBAwbXzE2anJppLziP3eNwmfy
-85yj5aRrFmk0zuW6QhJJwRTdA7NsOW6PxyPWEEqlymsFtN73MnO/Yuic5kLR5PKH
-Ow==
-=Gi+v
+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
+QtHk8oc7
+=A0gH
 -----END PGP PUBLIC KEY BLOCK-----
 ....
-