Index: head/share/pgpkeys/philip.key
===================================================================
--- head/share/pgpkeys/philip.key	(revision 54110)
+++ head/share/pgpkeys/philip.key	(revision 54111)
@@ -1,107 +1,107 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh philip 31AEB9B5FDBBCB0E ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   rsa2048/31AEB9B5FDBBCB0E 2015-06-14 [SC] [expires: 2021-07-01]
+pub   rsa2048/31AEB9B5FDBBCB0E 2015-06-14 [SC] [expires: 2022-07-01]
       Key fingerprint = 2CD1 92C2 6EE7 B7D1 F552  6619 31AE B9B5 FDBB CB0E
 uid                            Philip Paeps <philip@trouble.is>
 uid                            Philip Paeps <philip@freebsd.org>
 uid                            Philip Paeps <philip@nixsys.be>
-sub   rsa2048/7C62BC4776C9F29E 2015-06-14 [S] [expires: 2020-06-01]
-sub   rsa2048/935DB8343AF25C94 2015-06-14 [E] [expires: 2020-06-01]
-sub   rsa2048/CFF632544136DF54 2015-06-14 [A] [expires: 2020-06-01]
+sub   rsa2048/7C62BC4776C9F29E 2015-06-14 [S] [expires: 2021-06-01]
+sub   rsa2048/935DB8343AF25C94 2015-06-14 [E] [expires: 2021-06-01]
+sub   rsa2048/CFF632544136DF54 2015-06-14 [A] [expires: 2021-06-01]
 
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQENBFV941sBCACkoVSVhhY060ZrtaLWRpDGCtof7F1Kuot821zHCJmNXV8EKppV
 f8eMtwGz7TQj3WlWGpiN6RZQ6mdHq9sPXdPROO39017v3NxrPUMNJMeI0oewRSkH
 V2GxOjF2PrZA0QnzgwlSqG2dfdSrMl3cFTeoHPGKn1c1vsc381HY0LnQWxu2WBXH
 5iLvKPnSTpAzRoQjGazniLSH+BvmtmUkgI0BCV1184f1GWGaxe6OoXsgXzuKWTEv
 v/h1YRvNBa9taRFo3qg1TMJIJW9EGxulTdT4w5wrbLFkVIRDTE7X0PcDZnoNP8OC
 iu6taGhFBYxsqX/FwqULuV4S/9KGRss4PFuzABEBAAG0IFBoaWxpcCBQYWVwcyA8
 cGhpbGlwQHRyb3VibGUuaXM+iQGCBBMBCgBsKhpodHRwczovL3Ryb3VibGUuaXMv
 cGdwL3NpZ25pbmctcG9saWN5LmFzYwIbAwULCQgHAwUVCgkICwUWAwIBAAIeAQIX
-gAIZARYhBCzRksJu57fR9VJmGTGuubX9u8sOBQJcyfzYBQkLX8rqAAoJEDGuubX9
-u8sOIb4H/jEbMen+r5h+WJBF7N9Kt0SaaPBog+v3kiLFXhn8M1ZVNvkco4epTHQz
-CHlLHHyPhVrpPyaEEKAdQf6tR9jb1+WZ/cscjEz1MTEdC2xLD/PA8DrhhqtqndV3
-x4Ik5RnO+OIQugPZdkCIyQsMBY0cPGL+Dkbfb5LMPe/9DP03Q4zFVJNViO9mfMv/
-pbmeId0BaLPR8REV7701dPzM17YAq7wNQ3dk+J9K70cgLPLit/6pL6faSlrJNXkD
-iuShRnJ4shhxNB+KeeBQZ/E8AFCTCaC3duSc1tb+OkRGiukTmOvlJH2Rak/fpJfn
-gPLmfmmdbcJ2WLnQEuZH4kEqNrrZqXa0IFBoaWxpcCBQYWVwcyA8cGhpbGlwQGZv
+gAIZARYhBCzRksJu57fR9VJmGTGuubX9u8sOBQJetNqYBQkNQP6XAAoJEDGuubX9
+u8sO0jQIAKEpjHJD8VSdwhBN/vS1Gq0Rz/YERYnw+rbRywrS9HkNLVB7WmBy7XVt
+wh99K5//YOch4v0l3MhBeA/AKrHqGh8me2/xbPAOnAvnDQdUfG0b3xL2SRaqGXYv
+TwHUnMNI6HKPIRaFAbmDWtI8V5zLbfZNEOyZwz6piEOvuwNCZav3J7wbvPQV1wDE
+I7jGxWu9I6GE/7hXxnv4WDuV6AqMaT5NyFsKQK642LNVNHkc1crIBTc1jBZO6U48
+GJsRamBZuXNV6x4e4yQa6iN9iTAxpIuW43OMd9MR5dbZPjG/Ms6FrOxxcKkE8ayH
+9NsqFFjZkfeQr23edatdZ7P02IorkLm0IFBoaWxpcCBQYWVwcyA8cGhpbGlwQGZv
 c2RlbS5vcmc+iQFuBDABCgBYBQJWry7wKhpodHRwczovL3Ryb3VibGUuaXMvcGdw
 L3NpZ25pbmctcG9saWN5LmFzYyYdIEkgYW0gbm8gbG9uZ2VyIGludm9sdmVkIHdp
 dGggRk9TREVNLgAKCRAxrrm1/bvLDq/iB/sFJOV6UhPIBgSpau6PSFa5ey/xKew9
 xauifYaegPtbD7Ni+cJ2py9mz9oS1pI3nMTqCwYDUST9InI6Z+9kYVs/D27VW8qz
 Xkl7Ieq54VHBPEBs7/cuvp3bUkNiHg3ug9qBHgYpB+o7vc2qatM20QifpnPkzWN5
 j4tjU6EPYDk/kAGcXpeNNASn8Y+l7YXvIb2Wr2hHcGPGlMGvKC8AY/vwtzvm7qZ+
 cJJ+WfOydNwNnlRB3g+u9D+IefFsIoDCat3mZXm+2lAnHAiw7vzDKiZkl3y+Frpu
 2m6ovtZ2afTR73slF6jh94igsvtOIHzyQrab/ENF7GuVVI3zWIFHfxUqtCFQaGls
 aXAgUGFlcHMgPHBoaWxpcEBmcmVlYnNkLm9yZz6JAX8EEwEKAGkqGmh0dHBzOi8v
 dHJvdWJsZS5pcy9wZ3Avc2lnbmluZy1wb2xpY3kuYXNjAhsDBQsJCAcDBRUKCQgL
-BRYDAgEAAh4BAheAFiEELNGSwm7nt9H1UmYZMa65tf27yw4FAlzJ/OUFCQtfyuoA
-CgkQMa65tf27yw5jNQf+IamX+XuS4XsLNBNtCZ3IO0Z9AVtey533MDrSMc9JL3GU
-IwcLQn6xLnVoV3ApjujTC6ef9nakmzaaJzfOKQXCr+6Jq5L2ZCjBRYs7KLjk0hdD
-rhc2zHMl9GRlaqOuPGEX1k8oP7NkS9s6YJvmDwpGqY+kj3xZkNjEsH+nJEFy7qWe
-+OwSFH1aFgu9+AQTsTvcHYUhwv0gNPK8QQGNH4WPRtKw8mQ/TjcXj0XpUgGUfb1V
-Xmw57ffUPWN5iJJ1GH+6N7nAD3kfCCsncZGXjkoR9ILHxr9hNRzw1OCoeRxqwi2C
-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
+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
-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
+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
-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
+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
-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
+rrm1/bvLDgr8B/9l3XuoTJkVhOrPZEpVTfOsaqVnbfvLbAZ1E/fQxSOXPRq+mcPG
+DgH1wcxG8B0/igoBahu2vwDoVHQw1hhxgXaON2PU3L0Q5JVCKRLue9W8YEoXD/CN
+x0a12XP009OFlrR6jL7t3fAlehA3Ct8HeCW6ME5uaZQynysji+f18yge/0IeW3US
+NrY/gSM4a8ahqtGYw4PaiyoxlpKj0y6jLWzBIztGDAM9mTTwnTuGWko3TICESbck
+KzzAv3Ebl6SeMYY70C/cusaldAhirfFQNJ/ugDH0MetCSrOZMAH7sG6lDPaMFWck
+maJRDik6khJ0RPZ8yUYa5tlleyeeFyoUQPDDuQENBFV948QBCADZaSxwW2eFAJRS
 Mkv7Ude4D6C5yc7cODOJW0aG/oiNBzsc7h7qFVEmSLk5OpUbtL/IQ/TWRbtP9VYe
 jrEaEF6SB+YfESztX8b6ohzXEIDbDS0vtHp4qfxOgPPxM8DpCZE6GcewoZreVRiB
 vI4g4XYN5cqQgWUAXltUv/xHiNnoObPP32zVmDjREyV77n9cdc+c2BsODtp1uxq3
 OKZoVhcEz2ViSst0WR3OvK5NgAndSdSNqs8L/Vq2YgisKbW0KsiKI9tLU6jVZkGU
 hu6kwyBopikpDWuk/f9U/ctT/6Js7V57xHBx3uNZJ98lj7ip4CMswPOotCYooRwC
 v8prXDUJABEBAAGJAWcEGAEKAFEqGmh0dHBzOi8vdHJvdWJsZS5pcy9wZ3Avc2ln
-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
+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
-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
-=azxU
+u8sOBQJetNrHBQkLOD1lAAoJEDGuubX9u8sOajkH/j0ZjlYsimxvY/tTq3Ck+9sW
+NyTtuPOUXwJghPmZXTSVL3A9MSERDN4F1S3imYAXLkjx2WVVs+tkgHcYvzCkGh43
+ql+cy5Ie1BJhTIbuLUFPPsw1tHjJoL9YTY/WHH8reay2rrg4kPnJTYGFzA1OhVy3
+NGAUlORs10+psfe/x5QhXTZpbBZJU62IgHrFIz03F37NH7dp04GEzChHC5PV8ySD
+hz6mlt/PVzILKz+nDX8nasLq5hs1CcX6/qKZ9LzLjhA/RRB68Rlqtb+SbXeYTxfQ
+RZBKOVIfCaDSsG/DgQUK12JxZn5fgO75G7Kgv6b02PewcoimJ7e5aX1MxNFqW6I=
+=/2EW
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>