diff --git a/share/pgpkeys/philip.key b/share/pgpkeys/philip.key
index 53c1bfd58c..ba5ababc4f 100644
--- a/share/pgpkeys/philip.key
+++ b/share/pgpkeys/philip.key
@@ -3,14 +3,14 @@
 sh addkey.sh philip 31AEB9B5FDBBCB0E ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   rsa2048/31AEB9B5FDBBCB0E 2015-06-14 [SC] [expires: 2019-07-01]
+pub   rsa2048/31AEB9B5FDBBCB0E 2015-06-14 [SC] [expires: 2020-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: 2018-06-01]
-sub   rsa2048/935DB8343AF25C94 2015-06-14 [E] [expires: 2018-06-01]
-sub   rsa2048/CFF632544136DF54 2015-06-14 [A] [expires: 2018-06-01]
+sub   rsa2048/7C62BC4776C9F29E 2015-06-14 [S] [expires: 2019-06-01]
+sub   rsa2048/935DB8343AF25C94 2015-06-14 [E] [expires: 2019-06-01]
+sub   rsa2048/CFF632544136DF54 2015-06-14 [A] [expires: 2019-06-01]
 
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
@@ -24,13 +24,13 @@ v/h1YRvNBa9taRFo3qg1TMJIJW9EGxulTdT4w5wrbLFkVIRDTE7X0PcDZnoNP8OC
 iu6taGhFBYxsqX/FwqULuV4S/9KGRss4PFuzABEBAAG0IFBoaWxpcCBQYWVwcyA8
 cGhpbGlwQHRyb3VibGUuaXM+iQGCBBMBCgBsKhpodHRwczovL3Ryb3VibGUuaXMv
 cGdwL3NpZ25pbmctcG9saWN5LmFzYwIbAwULCQgHAwUVCgkICwUWAwIBAAIeAQIX
-gAIZARYhBCzRksJu57fR9VJmGTGuubX9u8sOBQJZCwozBQkHnBJnAAoJEDGuubX9
-u8sOOdUH/0b2/0j41llUaeYGQwVfzxC9+mXO312IG4ZANk08ztOVytPeUo83lLm9
-mJPHRSIfdcXs56RARqpXCAwxyz6rk0gyH14LHGjnCvuLH5o2YJZY8UzYHhvtK2rG
-SxfCv0h1GsYPMlzVlnUINZaI9Wqs5fEizPwOJDninO+YxNnwlXe7GcRqK76bESQH
-liSyzlwbnNcbrf5NmOQqsVFo4Ggu/RiIkl6mets4EJFRu/vT20LzKeI4NTEmwVpo
-I+0owQVcuDypzy9uXWyPwVLqQGW8t6DKIo2FRV0lAOTXqn4KRLSyvtVTiS64bw83
-c/v6xyy5xSDFg/2X1xqC/shXE4rM7EO0IFBoaWxpcCBQYWVwcyA8cGhpbGlwQGZv
+gAIZARYhBCzRksJu57fR9VJmGTGuubX9u8sOBQJa6XKJBQkJfpdnAAoJEDGuubX9
+u8sOhKAH/jA6TK8zl5TM9x1g3cBtP+qD7pTOKoa4JQnwHPO4JITQq7RnLgPod4q8
+MjViUa4ZVI3kiOwziYl9jqKxGHt7NkXMvylK348sEk/mElmRCzNzpexda+DZ0sVA
+2TEij16V5PfOjYf9o0JBj2SCm2Sic+B2ofibEx6uYZ0s4zUOWVUW4WpnWf/xcYq8
+2JS8Lrjp+pejJJ2oAuqdix/1HSgz+TZD1Onh/Y6AqzBRoEmRbSjHViclf+yyN5HD
+zqwbsFoDptQUT5+uTfOf8sTGc/vtGmymju8k8LyNLCMRXdUp4VWGYXkrC+ZLarOF
+H0FT7gaLRwCr8/dic5SztGAlIBOasIG0IFBoaWxpcCBQYWVwcyA8cGhpbGlwQGZv
 c2RlbS5vcmc+iQFuBDABCgBYBQJWry7wKhpodHRwczovL3Ryb3VibGUuaXMvcGdw
 L3NpZ25pbmctcG9saWN5LmFzYyYdIEkgYW0gbm8gbG9uZ2VyIGludm9sdmVkIHdp
 dGggRk9TREVNLgAKCRAxrrm1/bvLDq/iB/sFJOV6UhPIBgSpau6PSFa5ey/xKew9
@@ -41,54 +41,54 @@ cJJ+WfOydNwNnlRB3g+u9D+IefFsIoDCat3mZXm+2lAnHAiw7vzDKiZkl3y+Frpu
 2m6ovtZ2afTR73slF6jh94igsvtOIHzyQrab/ENF7GuVVI3zWIFHfxUqtCFQaGls
 aXAgUGFlcHMgPHBoaWxpcEBmcmVlYnNkLm9yZz6JAX8EEwEKAGkqGmh0dHBzOi8v
 dHJvdWJsZS5pcy9wZ3Avc2lnbmluZy1wb2xpY3kuYXNjAhsDBQsJCAcDBRUKCQgL
-BRYDAgEAAh4BAheAFiEELNGSwm7nt9H1UmYZMa65tf27yw4FAlkLCjMFCQecEmcA
-CgkQMa65tf27yw6rXAgAiYkbiGUPjiTuELOH9MjYsjKHwWM6aDNLPJo4TF7/p5lm
-KAC34C3O2gZ4a6elOHKPTekI3IuwIYxn8y1pqy3w6qBa6lTiQ+trymP3erNUxZ71
-bkvvWEdiM1tQsX674E0YaBL43DlZfMJ3B+IWoP5LHTQQUJtNWpCVrBPKbNaa4x/L
-GJrEScj3dBeIKiquzmkUrFDnvgnyiYMWnFO87X8utE2mrS3imAgvGBPSCmw4fF2w
-X/zaXBF0Y3jZusFXGuZ2G28I7jpb3H4TDL9cpBAGU5ro3R8Vl7KgL7fUBDSVmsQb
-ifBLw32JSiRx71w/OT8RHUvieHvGRPRRV64BenKuWbQfUGhpbGlwIFBhZXBzIDxw
+BRYDAgEAAh4BAheAFiEELNGSwm7nt9H1UmYZMa65tf27yw4FAlrpcokFCQl+l2cA
+CgkQMa65tf27yw43oAgAhxap79fxZxS4GvLmRGpMXaSppOtxVYB3uAGNGmwMPejs
+C3gmsg7l7SCqrBc9jZNqQrocYEDS025ELjLIi7kptY8mb/WY7HvesP4QErYovVcP
+iaIId1/v6Dg7lvfKa5VMvF/EgnyWZD24Jhiu8lPO2o+RMCoC5dbicN9/yCaSAzr1
+7oPqOSsw3oAb/1mn1bx7ras/u7D/NY6f/c8G7pwod6s+YHWXNUS7jTVklJrjDiDo
+Us4Mngj+QLewM2OhfMrN2cMinYqtvJe+SjvKm8dj4SzQETymUvM/MziRqFBTEYyx
+Xy8/OTJJMFqWMEh104O1eFlmlVc2rgCTCuejTc2JcrQfUGhpbGlwIFBhZXBzIDxw
 aGlsaXBAbml4c3lzLmJlPokBfwQTAQoAaSoaaHR0cHM6Ly90cm91YmxlLmlzL3Bn
 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
-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
+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
-Y3kuYXNjAhsCFiEELNGSwm7nt9H1UmYZMa65tf27yw4FAlkLCfEFCQWTUZgBKcBd
+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
-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
+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
-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
+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
@@ -96,12 +96,12 @@ OIeEPExRM5PBrBA5WHOks363Jmipc4gCnv2gptkPOT0SLbtg1FJi/Ke2i0hU6QKd
 87wiv6wr3H6EeH4r5/fBrFG6v0b17f10+wQTnMTRFMukcwVhouzbGVR69+H3xx9N
 jnaRXUqyBdqPKfkp1s3QRwARAQABiQFnBBgBCgBRKhpodHRwczovL3Ryb3VibGUu
 aXMvcGdwL3NpZ25pbmctcG9saWN5LmFzYwIbIBYhBCzRksJu57fR9VJmGTGuubX9
-u8sOBQJZCwoYBQkFk1FlAAoJEDGuubX9u8sOTUYH/0siaOr5SIxbthgsfAEpuND8
-tIjqQ+l5kVKWb0286wLgz/K0YjR0DI/uEeuZ9KyQtzsIe5wVtlGXwxpHozIO5KTJ
-bSHPlTww86uZ+FpWxhBKSy+zVDr6cOhM9pqviHaKWRKREa998lkmluiOwl2BdM9L
-i4/SJZUcB5/v2fuIsBs3BijMDp+kIiU9MvBBL0nfMo0lOUY8mYN9RP2qr5KO+7nf
-NEfMPtmp64A2Sgb6ydu/r6UkPuJr2Qdw83IZbazXF+WV/L0rbCTVrqQCv0kCriKG
-5Dgp9Lx8clXu0doIozhpNn+CBW+Qdpn0LXoiKJ6oZ7t/aKvUF+9HnB8DQ0o/9S8=
-=A10P
+u8sOBQJa6XK/BQkHdITlAAoJEDGuubX9u8sOqB4H/igIGdhO2zwLMgciClknJyhd
+gisLCqWbFpXGnrUUMs3q5HLqtsjul+evfLhO0+btW/1444g79LRYA7EdmWVQ9Bye
+9pVUWCIcYE5gu39DJUM4Oo+OlSa/yhH4TG8KVJLbd4SCh/YMjINKvQBZ8QygTk6/
+flnmLwvMzP+liDczja22oWqNddzMfEI9q2I7dhVuDGwvoGipNIe00NaD2Ft1jnC6
+jtmgb1eAzAFP98D0qISW4BsB2fbRqm0tnFhxkgHeGNdqfchn5XQjK5ZG6NVJWEhO
+300TDXbTjkoASKIXrFCFTMnmIkvhAa2K6cQgol959s1IyicRJvnv8FcZn8mzSqI=
+=DPvN
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>