diff --git a/share/pgpkeys/danilo.key b/share/pgpkeys/danilo.key
index fb0bbbf19a..f73f26de0e 100644
--- a/share/pgpkeys/danilo.key
+++ b/share/pgpkeys/danilo.key
@@ -1,41 +1,106 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh danilo 9788BB7C;
+sh addkey.sh danilo 8586A54720E27246 ;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
-pub   2048R/9788BB7C 2013-09-23
-      Key fingerprint = 8946 BD31 4B3F 4AD2 428A  D6C5 D847 FA50 9788 BB7C
-uid                  Danilo Egea Gondolfo <danilo@FreeBSD.org>
-sub   2048R/7FAB4DF5 2013-09-23
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   rsa4096/8586A54720E27246 2015-10-19 [expires: 2018-10-18]
+      Key fingerprint = 691E 7D8F 6521 8237 8EB1  1173 8586 A547 20E2 7246
+uid                            Danilo Egea Gondolfo <daniloegea@yahoo.com.br>
+uid                            Danilo Egea Gondolfo <danilo@FreeBSD.org>
+uid                            Danilo Egea Gondolfo <danilogondolfo@gmail.com>
+uid                            Danilo Egea Gondolfo <danilo@gondolfo.com.br>
+sub   rsa4096/C2F847657133F473 2015-10-19 [expires: 2018-10-18]
+
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQENBFJAsQUBCADGGevxbnyfej7DGSv7EBBIXUiemS/1z9QdKEjU7DYsGbeAv0AP
-RU6wzqfaCKP+UAHvaAxt+nYaadWgEYlvrozNpTaQxR17sIJPYplPcDglOWb544Dm
-pNkSQK1tJ7MPgR7HleeFv7Lt3WYzvUoPH1P97GzPFwndT2mBlimQeHlpdjmY6Neo
-3ZCZ1qYQ+4/YlwU7dvx8R1lPVyTd1DLZFyU7EPm+MQhEfXfanG3nCttPf34gZp8Y
-Br+MOx46OhBaih0zN750VJoM4N9qPQ7ctm9Y0sn7muFVmV9Q/1FOuny3R2nbAXmJ
-wzJ267uK4YI39UiEXkb7pPDueViJVhc+GK3RABEBAAG0KURhbmlsbyBFZ2VhIEdv
-bmRvbGZvIDxkYW5pbG9ARnJlZUJTRC5vcmc+iQE5BBMBAgAjBQJSQLEFAhsDBwsJ
-CAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQ2Ef6UJeIu3w7MAf9EiL3WLmz592p
-iK8eV9rZGVdOK6XYQJLp1vXCLoK0yozKLI34hXtIeUAOVm8d4yI+wOcjush7NyAI
-a3Q/nHpW/dD4pYCj0mn2SBWnv15rPzEdIroRT+dpL44UAL+PrBhcvn2gERULGoJE
-JYZpVRKcuB+7foZxoMk+7E/EcGHsMQwJ3pWWIKzD0qwUdluLs5gowcxGeTCFHdxK
-XWUNkA9Cr/+KW8LDFF1jVd7ARrplDm5z5o2x+JnQsYXqkB/mMWBCKv+0gmK2xbFp
-VR+7mlmIlydKsusCXaBw3z6lAogfsN56GBJIxYwt5YMQtMT9l6bfltCevtQPrJ32
-tHw0W9AOBbkBDQRSQLEFAQgA8Mw4jX0ErgRJ1vV7s4FsrK3n87ubxdj9NiHN4cSo
-B64x24iXd8DscEpPAf5lJKdVmVPd0r7zHcUHEFTjLhlKgWu/hUVeovGEaJJNTvOr
-3crLuQS0keWkKfWhI5O/yGIEe8vFFBBtye/tG2ZQ477buyT1E0Moq26bdY64N7PS
-uazxZ5h22xyCiTQpCILC4pSAmoEhwXviODTPwyFGviJGIo1cVwzLWri4ObMumMGl
-a/m6CzT7gxXqLlYfOEOVBbSMT7OanVzb5QaOc25oi5CMXbBMUB4NWYzAK9nxvtiu
-dFB/2iPvkTUIldwjV+PJoY2lcZ8gN36zHTzeI3vVuo4CIQARAQABiQEfBBgBAgAJ
-BQJSQLEFAhsMAAoJENhH+lCXiLt8PBwIALupt2M/U2U/szyvwmMuGg9tJaQKmKqV
-cyKXbtGPHVzycKWwRzpdVn4gUjyzuGKbIptE5sWMvUbHrfHvxXVFbJeN4SbzdnUy
-9KZZMph/UZUET2NefCnX8UdPeASonqgp2gzBiEGaB5G1Ph7aB/irzA6VmIGrsgVW
-qOT4hkz7CZsF8G+9xqbCHCyrQvw72HPYFFxH6Eh/P4UV7/tbFw6Zlnr1pGxSZkTj
-0StWUz1EdhXCA5Y4QI1BaRs1sTJQDT1jCYhMFw4nOKbRUeCOaI3ixU3ygco13eCx
-2QcclRxZFPjwiqT5Q0H7vW9uj2UwouRF/78Wlywm1YXhBQEwrWVWXm0=
-=NLwl
+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
+vl+KR7LiljRreb1+/ZAIUw0PGg==
+=M2pb
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>