Index: head/share/pgpkeys/pi.key
===================================================================
--- head/share/pgpkeys/pi.key	(revision 49229)
+++ head/share/pgpkeys/pi.key	(revision 49230)
@@ -1,64 +1,64 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh pi 2A4392E050E8798D ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   4096R/2A4392E050E8798D 2014-04-24 [expires: 2016-04-23]
+pub   4096R/2A4392E050E8798D 2014-04-24 [expires: 2018-07-17]
       Key fingerprint = FD38 1F8F 1360 2A49 26D4  4CF3 2A43 92E0 50E8 798D
 uid                          Kurt Jaeger <pi@FreeBSD.org>
-sub   4096R/2FC3A793B283D724 2014-04-24 [expires: 2016-04-23]
+sub   4096R/2FC3A793B283D724 2014-04-24 [expires: 2018-07-17]
 
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 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
-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
+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
-YwShPsIFgTprlkoIwjoB+PzyktB0DPhX5A8AEQEAAYkCJQQYAQIADwUCU1lYvgIb
-DAUJA8JnAAAKCRAqQ5LgUOh5jRiXEACIyuKdkEOGmdHpHVrAapr9Rjvgt6Z9E/6T
-ezrYUngPiYxWtg1BV4m+iJgPORP6NtrcPdH20WF8+u9CDO8F8E+DU8m4gjkPdocM
-mBqQg6ZWD6cVMg8PSE+ymY+G7/emGN7qWAcSxz3BbKFGT4xTqz0f+fodXZeTKQVY
-Nqnhz7JB1CYXtQhlUZM5z/TXOXIqSlUs+IOSGdnmTLd1+rYQNUl0RAae9ANQ/Se3
-LRYpTgmbL0gn3gALGOCq+8SMxEHIDk+82KMDKYHSvBG//IwjXH6AT29RFf5Fpj23
-7az0LGpTspRPguwKkXSo0dR/verL9SUyOS7SvjfQ7SMRkF3io1US4MQzL2cpaqVJ
-B/bAPrZtaYeEtxL7ZlVqsz7SeoIvZovk6CZIFp0QaIo6cFuWmeZ25ann8ARu8Wmz
-aZQRe0uewBez58dZMQxzz+FWQ4PDa9RyHHpd6vyT5Y5p/Kuk07zyOv8/QL2fTEld
-9msuBHn4UW19IyeZWLtW1HhtrHE5LPfrO1vr9tE4RQ5MqYFpu1F+PgTSvG+LRezL
-qYbw+Y1xD1zbuslfcEUM5NFbprT7z9/Al634JoGm6n1XY8k1pZjukt6viKkvFKqe
-uzqnXSNtzFwD+TiJ6ShXUud4Gk90WRSMtEyAIg6DdYeWpwkFPGZfAz1WiMCYobTt
-qYzm6gQwKg==
-=iRq8
+YwShPsIFgTprlkoIwjoB+PzyktB0DPhX5A8AEQEAAYkCJQQYAQIADwIbDAUCV4uB
+zwUJB/SQDgAKCRAqQ5LgUOh5jeJTEADOdD5gXf5RYhRrT9cxV4XT+uvT/VO35NIN
+Pna84/pRnBB9OjvcUN9H15DR6YB0MlV8x0RAlTO9gele3Z8F6TGuyVLYAW2VAqTm
+mfwWZe3KvOUWhZzlw7jazlvyNQcZV3XS66oOWio8XtTjTyTj+R0J/QyUKjJ0CbpP
+V7qYbU3dv5wWFDI3jIZA6PfwDCgkYv9Ixa9V/9HhxfgKDELRY4TIiWeutOc8HPg7
+kQq7Su7B7dpIYDMobfkYmc8ZRn+dJt72fxw2Togc7SUsbxRaRmAhX1LByvfG48Aj
+UB5vufW3NKX4zicXYxo1AzrqW0oWnOsiPGx0ZHaFujZOfYhaIPnhciv8yH9kkHVg
+6M37TFC5LJwoziFdWX2n2tS82CQQTCFxVikyQfHdZkCeZweGhVV3y2vScvBrxKj5
+G++4uIY4XuDZicUxaOnP7EBWwDNqCosbDmfW6tq2EKgTAMk9jxEOo4O5WgI+vtn2
+Gr7GPIb3Wn0KmVHEaK3oftLGxSiSC6LSursCQzw0TecFjxu1i/aqUSQXGHAxkjXW
+r3+OUPamFtTXJaXNia434BWTZuD68Q+f0zWDo2LoyWWZ+4JVAH4KB6FV1Jxu7H7n
+ZsYApw6D7JzrlzrY4YsOSwzAWydugvT7DM+9z3rF2jsDYhdkV9lqcFmoT3l6fWxm
+OmdnRxHyVg==
+=4ARR
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>