diff --git a/share/pgpkeys/netchild.key b/share/pgpkeys/netchild.key
index 036d17c769..b84738bc97 100644
--- a/share/pgpkeys/netchild.key
+++ b/share/pgpkeys/netchild.key
@@ -3,17 +3,17 @@
 sh addkey.sh netchild 8F31830F9F2772BF ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   4096R/8F31830F9F2772BF 2016-08-16 [verfällt: 2018-08-16]
-  Schl.-Fingerabdruck = 0340 55A3 1F55 0AD0 32E2  F6D7 8F31 830F 9F27 72BF
+pub   4096R/8F31830F9F2772BF 2016-08-16 [expires: 2021-06-16]
+      Key fingerprint = 0340 55A3 1F55 0AD0 32E2  F6D7 8F31 830F 9F27 72BF
 uid                          Alexander Leidinger <Alexander@Leidinger.net>
 uid                          Alexander Leidinger <netchild@FreeBSD.org>
 uid                          [jpeg image of size 9696]
-sub   4096R/37E5327D7F064691 2016-08-16 [verfällt: 2018-08-16]
-  Schl.-Fingerabdruck = 9840 A305 9FE2 D394 17C8  4C8F 37E5 327D 7F06 4691
-sub   4096R/AAF1421A85208084 2016-08-16 [verfällt: 2018-08-16]
-  Schl.-Fingerabdruck = 860B E268 4532 9041 CAA3  B714 AAF1 421A 8520 8084
-sub   4096R/0439FFA68121245E 2016-08-16 [verfällt: 2018-08-16]
-  Schl.-Fingerabdruck = 3051 70BC C4DA 3A35 A341  BF95 0439 FFA6 8121 245E
+sub   4096R/37E5327D7F064691 2016-08-16 [expires: 2018-08-16]
+      Key fingerprint = 9840 A305 9FE2 D394 17C8  4C8F 37E5 327D 7F06 4691
+sub   4096R/AAF1421A85208084 2016-08-16 [expires: 2018-08-16]
+      Key fingerprint = 860B E268 4532 9041 CAA3  B714 AAF1 421A 8520 8084
+sub   4096R/0439FFA68121245E 2016-08-16 [expires: 2018-08-16]
+      Key fingerprint = 3051 70BC C4DA 3A35 A341  BF95 0439 FFA6 8121 245E
 
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
@@ -31,19 +31,19 @@ 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
-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
+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
@@ -69,19 +69,19 @@ ijJn6A0KC/lyLnrwLjucN4uyk5XsKcCMINVznSi2w3wNdu2bxc2IT62H0I6YtzZz
 Rwa5lodJ2jw1RUeiE6nFIM7C7HUI8LAZ480Wj//hCbDTf+BIhg4h9XsaqFPF7U0Q
 AULdDMqN8qizDXGnxAgSZo/i9dj3dCO/zw36jRTmkfG/8vrWwiqA6Jv1jWWh9BTv
 aWyW8e2d89dwN+QPAQEYwMz3ZzGPMnkczLD0LEFItCpBbGV4YW5kZXIgTGVpZGlu
-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
+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
@@ -297,19 +297,19 @@ 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
-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
+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
@@ -404,6 +404,6 @@ pDkpPS6h5AGTb/PmLuP3Z7qaisx5vSMQUd8k9VOWrve57QVwSDdqHsBqX5dLlt+x
 KJVxRexC2RRpoTHjxQO/OB1ehC7eyoipL374SRPvm7Vp7wMce7JLIrRm+1zXIPMB
 Ksk2MgX64m0xx7ZGQzaZzaGCON99A6O+bbz5Klj2Qm1sNvCKK1haBPHWdBuE3M03
 yUiL3mhj8H3BL6iPq5uxhB/SCwxMvO83xxrIwxCJEnDkrMS0GaX5ew==
-=YFwT
+=TK2F
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>