diff --git a/share/pgpkeys/markus.key b/share/pgpkeys/markus.key
index 05bc59dfc0..41768e45c7 100644
--- a/share/pgpkeys/markus.key
+++ b/share/pgpkeys/markus.key
@@ -1,80 +1,81 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh markus 78F8A8D4;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024D/78F8A8D4 2002-10-21 Markus Brueffer <brueffer@phoenix-systems.de>
-     Key fingerprint = 3F9B EBE8 F290 E5CC 1447  8760 D48D 1072 78F8 A8D4
-uid                            Markus Brueffer <buff@hitnet.rwth-aachen.de>
-uid                            Markus Brueffer <mbrueffer@mi.rwth-aachen.de>
-uid                            Markus Brueffer <markus@FreeBSD.org>
-uid                            Markus Brueffer <markus@brueffer.de>
-sub  4096g/B7E5C7B6 2002-10-21
+pub   1024D/78F8A8D4 2002-10-21
+      Key fingerprint = 3F9B EBE8 F290 E5CC 1447  8760 D48D 1072 78F8 A8D4
+uid                  Markus Brueffer <markus@brueffer.de>
+uid                  Markus Brueffer <buff@hitnet.rwth-aachen.de>
+uid                  Markus Brueffer <mbrueffer@mi.rwth-aachen.de>
+uid                  Markus Brueffer <markus@FreeBSD.org>
+sub   4096g/B7E5C7B6 2002-10-21
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBD20hPARBADzumxDOkMdttpWKphTxFC/j0+MJRW5UmFjd43c301LEMFSJMkv
 06EukQSOVWGyGL70v/4NWx25BiLhLDIb4feE5SZccQTnjxXYCjkQ4LfcolqTAzga
 L3GLNF356vKLQPlv6J5ah3vdZHa8Djh8q0s6CHAPi2rhEVbO2x7IcRW6MwCg/0+E
 KmRtdsifDJ00iBEMpJAApccD/As/bzVXI4FZwjwIMdep9+He7rwL/xGK+ZmRUEoN
 iiIxfd2oOkwDXZuFqTGftONd9Apao+FefTbcpEfv7sBVzHCJBn2bTr5mTjDwuA8v
 hGQ/7+QyKIFPmsL5KZYPkBcRA195UBSdwEPdERGH+aWvDTVJieyetAiD78WTd5ez
 T0V1BADwVnc1ABRMz6e8HK+78G/4vMHKPPEC7YbSmOo25FKR7XimUIlvGfj+CNO5
 w6QSDJaIRo9yOCPEacMe91NeZskPlEEXN/KIOlV11vTZ/pVDMETnzdarNo2B7J2K
 4HQzTYBzfFHdCrKP0tExSCy0iN2lWzSI57S9o8YxgnwrmuJPN7QtTWFya3VzIEJy
-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
-1XEllA==
-=+q7n
+dWVmZmVyIDxicnVlZmZlckBwaG9lbml4LXN5c3RlbXMuZGU+iEkEMBECAAkFAkTZ
+3xQCHSAACgkQ1I0Qcnj4qNRBCwCglhvWAuZ+9bWZ64EXP9wHLiQYT1sAoPGL96ae
+YBK0wnq1TWjE9GPTYFXAiFUEEBECABUICwkIBwMCAQoFGwMAAAAFAkTZzskACgkQ
+1I0Qcnj4qNTguQCdHFTLRplJE7g607rCVSxDCefYw8QAoIMaWQv0Iflm5aAR0F47
+3WrjQplWiEYEExECAAYFAj20imoACgkQbHYXjKDtmC1WawCfUZkir7Dy7wP3hiNA
+X8yo78CpuFYAoMJtyYVOf8fayYICxujAO3zU2pjViEwEEBECAAwFAj53axIFAwHi
+hQAACgkQT4OMtyagqBYphwCdFiRae7gCvrB/jFA8ceyXaEP44doAnj41sLHZFGWI
+ZUmQmNTiNfZXYoQQiEwEEBECAAwFAj53IYwFAwHihQAACgkQdROiNhMQLPXCqgCf
+SgcJhp/6tnpjypjXWH9t6uKHg+MAoMYnXWc7iXVFvi99BonJW15V63uptCxNYXJr
+dXMgQnJ1ZWZmZXIgPGJ1ZmZAaGl0bmV0LnJ3dGgtYWFjaGVuLmRlPohPBBARAgAP
+BQI9tIVmCAsJCAcDAgEKAAoJENSNEHJ4+KjUCJQAoMsgaMOze2p3Iaz0/fK/Xmeb
+654IAKCDmJpex0C61bzfczSdaxXPPyIbJIhGBBMRAgAGBQI9tIpzAAoJEGx2F4yg
+7Zgt0WUAn1WbgrMzw02LdGQQLBMzY5CYXKxTAJ9uvEu5kTB1jFhMa/rM7r04dipM
+cYhMBBARAgAMBQI+d2sSBQMB4oUAAAoJEE+DjLcmoKgWxiwAoPKtxw1TpXp/6KTr
+YZD67bOTJA8+AKDzxW0tIl7ij/nnNE9gob7cSeCfuohMBBARAgAMBQI+dyGMBQMB
+4oUAAAoJEHUTojYTECz1ZIwAoIW7tPHgp/AAUso8L1C62O2WF4l6AJ9jsLQ7cBnL
+81TJ74C3Zey4iU0PNLQtTWFya3VzIEJydWVmZmVyIDxtYnJ1ZWZmZXJAbWkucnd0
+aC1hYWNoZW4uZGU+iFwEExECABwFAj4kssACGwMECwcDAgMVAgMDFgIBAh4BAheA
+AAoJENSNEHJ4+KjUzWsAoMhZqjpybn0KgRf8Br3eExRIbpcfAKC+OlKaKZLRSgbz
++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
+=rJ5H
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>