diff --git a/documentation/static/pgpkeys/philip.key b/documentation/static/pgpkeys/philip.key
index d0a8565b66..188607e570 100644
--- a/documentation/static/pgpkeys/philip.key
+++ b/documentation/static/pgpkeys/philip.key
@@ -1,112 +1,108 @@
-// $FreeBSD: head/share/pgpkeys/philip.key 54111 2020-05-08 04:15:33Z philip $
-//
 // sh addkey.sh philip 31AEB9B5FDBBCB0E ;
 
-
 [.literal-block-margin]
 ....
-pub   rsa2048/31AEB9B5FDBBCB0E 2015-06-14 [SC] [expires: 2022-07-01]
+pub   rsa2048/31AEB9B5FDBBCB0E 2015-06-14 [SC] [expires: 2023-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: 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]
+sub   rsa2048/7C62BC4776C9F29E 2015-06-14 [S] [expires: 2022-06-01]
+sub   rsa2048/935DB8343AF25C94 2015-06-14 [E] [expires: 2022-06-01]
+sub   rsa2048/CFF632544136DF54 2015-06-14 [A] [expires: 2022-06-01]
 
 ....
 
 [.literal-block-margin]
 ....
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQENBFV941sBCACkoVSVhhY060ZrtaLWRpDGCtof7F1Kuot821zHCJmNXV8EKppV
 f8eMtwGz7TQj3WlWGpiN6RZQ6mdHq9sPXdPROO39017v3NxrPUMNJMeI0oewRSkH
 V2GxOjF2PrZA0QnzgwlSqG2dfdSrMl3cFTeoHPGKn1c1vsc381HY0LnQWxu2WBXH
 5iLvKPnSTpAzRoQjGazniLSH+BvmtmUkgI0BCV1184f1GWGaxe6OoXsgXzuKWTEv
 v/h1YRvNBa9taRFo3qg1TMJIJW9EGxulTdT4w5wrbLFkVIRDTE7X0PcDZnoNP8OC
 iu6taGhFBYxsqX/FwqULuV4S/9KGRss4PFuzABEBAAG0IFBoaWxpcCBQYWVwcyA8
 cGhpbGlwQHRyb3VibGUuaXM+iQGCBBMBCgBsKhpodHRwczovL3Ryb3VibGUuaXMv
 cGdwL3NpZ25pbmctcG9saWN5LmFzYwIbAwULCQgHAwUVCgkICwUWAwIBAAIeAQIX
-gAIZARYhBCzRksJu57fR9VJmGTGuubX9u8sOBQJetNqYBQkNQP6XAAoJEDGuubX9
-u8sO0jQIAKEpjHJD8VSdwhBN/vS1Gq0Rz/YERYnw+rbRywrS9HkNLVB7WmBy7XVt
-wh99K5//YOch4v0l3MhBeA/AKrHqGh8me2/xbPAOnAvnDQdUfG0b3xL2SRaqGXYv
-TwHUnMNI6HKPIRaFAbmDWtI8V5zLbfZNEOyZwz6piEOvuwNCZav3J7wbvPQV1wDE
-I7jGxWu9I6GE/7hXxnv4WDuV6AqMaT5NyFsKQK642LNVNHkc1crIBTc1jBZO6U48
-GJsRamBZuXNV6x4e4yQa6iN9iTAxpIuW43OMd9MR5dbZPjG/Ms6FrOxxcKkE8ayH
-9NsqFFjZkfeQr23edatdZ7P02IorkLm0IFBoaWxpcCBQYWVwcyA8cGhpbGlwQGZv
+gAIZARYhBCzRksJu57fR9VJmGTGuubX9u8sOBQJglNiQBQkPIjHsAAoJEDGuubX9
+u8sOdD4IAJAB9v/l4LuuuyvmRKLOvdOjN/9+QwgkBS5NwiJTB9KtLPuqqrV+DKI3
+W274MNcDNq27ZeEEvux6wTlSdUEZhGTtAmAHjj1+gw25Ie9Jg1IvURAJw+r+cacu
+HNzF70X/gO6Vr/eRt3XF5ThIvO50gfsIHDynGGmIFfDoTTmGyQIzfSxVl02gbr1U
+zj/rHvAbfgEZuk2DIwXnMXQrymPG6RWUNzLMwQmHEqGmxjGJICAxrZsCwMKNVhiX
+yCLNLIUrxxq/wtgXuvFZQaHb5feegk4PeSn4aJzAKKh2jniZBeFP/RssCRyX7e66
+OoNCB2/jDNXpQ5aokw7tuhdwsRFgWoi0IFBoaWxpcCBQYWVwcyA8cGhpbGlwQGZv
 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
-BRYDAgEAAh4BAheAFiEELNGSwm7nt9H1UmYZMa65tf27yw4FAl602pwFCQ1A/pcA
-CgkQMa65tf27yw7q8gf8DLZXFQ5D0dbbGUM0QXCkNEpr4FVGxnwpMYUQXjPHsyMF
-a/fT1W/rJoASkYmRrDjoLFU54luN0PPVeQP83R6zzlifUUhy1FKJaChpRupIO6Ic
-e1Q+Cs09o/Zko85MTg8irob6d/bqqDu+7BEjfVJ6jwx1wW0e99nNOd+CvYMJ4adx
-K/X2cuLL/g5dkXwgkpbdFDIm/LELZ+SpDkW5Kx4/RcZuwDyl11WSl+zFDsF3JeTi
-btdlhXMJnzL1A7rdhD0PwQ+qpjB2WcPNCv/sTl6Tdlc98o0UhFnVBMeSE9QO++PO
-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
+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
-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
+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
-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
+Y3kuYXNjAhsCFiEELNGSwm7nt9H1UmYZMa65tf27yw4FAmCU2L4FCQ0ZcRUBKQkQ
+Ma65tf27yw7AXSAEGQEKAAYFAlV9464ACgkQfGK8R3bJ8p7xJgf/V9SmoBI4o2z9
+ryBiYBCinQz/mursZQzS1/i2PqCqKGgRKC154gL0qLLAJf/d3IeFpUzyLQVHuf2A
+C8W/XRSnh/IB/FG0KGtbsaw8l69Oj4xXubgS17R7ez1xpIyTTFlq/c9wxTx1LwG1
+HyaQ80GOAAqcbtwzUVIFu6mZXRHsBiniOhmBbbOtT1XtBUyC3Tsd/3LBRYIaQTYb
+a1sFl9YAbibftj6d+X1qxjuzjI1nUiCo3pIBGhM6EQ6InbSEoJ/sJKwP+ssIjgj0
+MeHPxEXUKzVxMnnrfrU3OyQLf67mIhUc/rSkQZan/8ZAHwupLzT4+lwRwhNNQV6i
+w32gyBswe6C4B/9RQtXAc5sAmdyYRvLB/XedefLtSD4Rk0Gdcd1oR8IEeJXJhCCQ
+WqJ7Jymqk61W87xFeYCV8CtnCydhBTpihZA5oq2xASVRmazAQw+Jf4v/Dez5YnvJ
+BpH4a1+m67hClxprNMA3zdg2+wzd2yFlvf/TjPMKpdAWKtnUsGr8glqoQ3ELMCC7
+e6RuZH1SsEB7v4XlxGPCMr9HtB5jv+ZzNESnn01alix2vVxpyTLu55BDLsxe61o4
+DfqHdnee7FdrQW9Y0/+fGH7IXPzQ0PnC8LBoVoeLNj5mwkuZ8Qqsr4+scgl/7J+M
+qYmUluFvnRdvqEyYtyXkCT3m8DjoW91T+XjKuQENBFV948QBCADZaSxwW2eFAJRS
 Mkv7Ude4D6C5yc7cODOJW0aG/oiNBzsc7h7qFVEmSLk5OpUbtL/IQ/TWRbtP9VYe
 jrEaEF6SB+YfESztX8b6ohzXEIDbDS0vtHp4qfxOgPPxM8DpCZE6GcewoZreVRiB
 vI4g4XYN5cqQgWUAXltUv/xHiNnoObPP32zVmDjREyV77n9cdc+c2BsODtp1uxq3
 OKZoVhcEz2ViSst0WR3OvK5NgAndSdSNqs8L/Vq2YgisKbW0KsiKI9tLU6jVZkGU
 hu6kwyBopikpDWuk/f9U/ctT/6Js7V57xHBx3uNZJ98lj7ip4CMswPOotCYooRwC
-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
-=/2EW
+v8prXDUJABEBAAGJAWYEGAEKAFEqGmh0dHBzOi8vdHJvdWJsZS5pcy9wZ3Avc2ln
+bmluZy1wb2xpY3kuYXNjAhsMFiEELNGSwm7nt9H1UmYZMa65tf27yw4FAmCU2MsF
+CQ0ZcP4ACgkQMa65tf27yw6wTgf4u5TxvxC8Mo8VdhJYRC9j949QzpUSIXwBAMDh
+0jz3crCAo/SjtA42sxyDJmleH2rTM4YNHzaGs2CRpjghKxv8LUP1+g9F+5Hn0vAI
+tAQg7skR8EWvL8I9vGjz9LcaXYztQhYdfJS2OH9QKzcwZyR9JRCVq0jEjIbB4Y+h
+pz4lgsgn48fMGN/1o6a8YjrsQT0BqNTVQetbrE+MMoB+50yqecQKqIetWleqLB6Y
+Jz1ba9jlRez5Kf2UPlbThhJlwkLDL2WxYKKkq6oG5M7gWq/ojKi4lRHSwGw2kbL1
+JLfzOVv8kXiwdMVD6BQ0FhpERA10p1Z5t0ie8WJpDQJz/kuPuQENBFV949wBCADs
+m2Ke+vn3Hahn3via5FtyAAqhQt1L5ya2khexy1AxB+5dDvOmHQJnrT8vH+hIkHxj
+jJpj0HSoWQkXwEUp6qoiF1OIXRVB9iC3zooN57f1BO5r6dDstg3Q62zB3m3OnPEV
+zSfRxRY1+7+ntI9jqhgLwla5oZfxkl/ugQpHo7U63GjL3KkvlnpxbspH7zpFtVs4
+h4Q8TFEzk8GsEDlYc6SzfrcmaKlziAKe/aCm2Q85PRItu2DUUmL8p7aLSFTpAp3z
+vCK/rCvcfoR4fivn98GsUbq/RvXt/XT7BBOcxNEUy6RzBWGi7NsZVHr34ffHH02O
+dpFdSrIF2o8p+SnWzdBHABEBAAGJAWcEGAEKAFEqGmh0dHBzOi8vdHJvdWJsZS5p
+cy9wZ3Avc2lnbmluZy1wb2xpY3kuYXNjAhsgFiEELNGSwm7nt9H1UmYZMa65tf27
+yw4FAmCU2NUFCQ0ZcOUACgkQMa65tf27yw5mEAgAmrkCGR0VW/FtzwA0+jQI5461
+3vP/zn4jX23NhsF+bE4f7e6ix1Xq8n0VFNabZ207xEsolEGnaEIU9rSYBr12rTpA
+rw9BhUcmJ4DcnIb4c6IEYW6P1lR99qq96vamEhZQ72PQLOyPmI7PopTyXbgayNqR
+Uu1hJpnY+SPpbgULiYGJZxHqYgzsUeRGiMJN2XzSr0FYFWLYW863kJUCACAEvUz5
+wprcnDDBvsFQ5y3Q0487Tu5TF6XsahzH8ePK+sA24QqbIZRUFwFEVTUUV/qpTlLr
+WiF4ptZNkD7plg0dW3p0ro5gMB6FlJAO+2hqOhTFZYVcH4RdrHz2tAhh5VthZg==
+=bgll
 -----END PGP PUBLIC KEY BLOCK-----
 ....
-