diff --git a/share/pgpkeys/emaste.key b/share/pgpkeys/emaste.key
index 0ddd78cb66..bb6cbdad5f 100644
--- a/share/pgpkeys/emaste.key
+++ b/share/pgpkeys/emaste.key
@@ -1,42 +1,42 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh emaste B6B1E8BB06F59C39 ;
+sh addkey.sh emaste 5D9A9C3B43EEF099 ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   rsa2048/B6B1E8BB06F59C39 2015-07-08 [expires: 2017-07-07]
-      Key fingerprint = 7FBF DC24 51CB DF26 8C6F  ABBD B6B1 E8BB 06F5 9C39
+pub   rsa2048/5D9A9C3B43EEF099 2015-07-08 [expires: 2017-07-07]
+      Key fingerprint = F7E1 F016 EF5B 923A 6134  8BC8 5D9A 9C3B 43EE F099
 uid                          Ed Maste <emaste@freebsd.org>
-sub   rsa2048/7E34E098EEB61C8D 2015-07-08 [expires: 2017-07-07]
+sub   rsa2048/A294A95EA92D2D89 2015-07-08 [expires: 2017-07-07]
 
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQENBFWdjWYBCACU8TJkSCYCAzPqpPYVDpvWuO+oMdMM5CLi9zYlOczJCjsb+dR1
-Bnir0cuZg6iYGgkKAmkw5U7rTY8WjRVmG4wPEiIwJI5buVFYY2mCquoYTxTvctDc
-+aNF7ErC5IYul25srS915OSkth8EQCyaO6xDl62IZvkqjwK4cTcuafzmoU1yrHcV
-d9vwroWb+28FEQDKwhMDZsfHvRcd6SyufTILuEsjZt2oiCPN/lCbepfXvfBbJcJt
-JXPBEtmUBzXhMisc/oAeyGi9tHpe51nH4wg4DpfE8PP1rvuJEZ6VdvZLQD45txF/
-3J/JhFNW2nvGleS6SJnMs0E6/IJWcHharS09ABEBAAG0HUVkIE1hc3RlIDxlbWFz
-dGVAZnJlZWJzZC5vcmc+iQE9BBMBCgAnBQJVnY1mAhsDBQkDwmcABQsJCAcDBRUK
-CQgLBRYDAgEAAh4BAheAAAoJELax6LsG9Zw514IH/3EnAmiSd2EB1Lbs8qbEg6QZ
-C5xm9K9fZdWUICAbUP0fxw9WQv0hNdhyvwa+hX4bOEUAVwKmkqTZv6IUQVsqPfGx
-kyi2FnxGFa5VDM3lsc5UqOtYvoahooEhk7NWzxbzmlXtFs0XsoxjkbMfwXbCi8ew
-mYek34yCnwszdOfLRQ9vY+BummBxfEfykjHfs73hkovMz8uzUUXcu9/UC2nrKOyq
-yvCPUDa+3SX4TczFn/6hfzBV79vzk9q1tZiHazcZrOH30szIdu+27UCS7zsX5iA1
-2ZtHH3BPG+5SlNd9HMVGunNQFigEsaxPm9ymmqmIv5ftpeOCJxKObtkb7Jin6pK5
-AQ0EVZ2NZgEIAMwevfrusmdrjPepEi55xYjdeAC7xEuDsjHzupJZ4+JveH0D6rce
-VVe4nxxMEDcEq2RWLA+h/u9W4qAZN25M8Wwkwt0rK1ATUjxuvIXmOKKvILI2qNDO
-RM6J9WixGoWPfQXSOXtrdfkzr5E3Hb71b2WQzRins1kljkJjr0pvinUlssS2dJBF
-HkDBjNUTy/Bwr/yj9OZXzwkwwqGnptZOzp1JpMvScxL4lq1TXhf7yzeVry1H2Aez
-DwRfZkcJ7V4CF5fyiLDmIKTFJSvZKK2uCaInePD67fNMJDHF0qK6zqDY09ncV4oH
-v5nCpQyp4KS3q3HGMYQ0lhjB3JkMHh1ufG0AEQEAAYkBJQQYAQoADwUCVZ2NZgIb
-DAUJA8JnAAAKCRC2sei7BvWcOd7HB/9qeOQR1+B2LvK5mnDK0kwRDpuLxuzOb+8U
-zq4glELzYvXoBdx+3k7CSLME3mFxwcG9wYq/bRInw7Hn7pTvIlzr2bi+THtV1nQf
-AVFv6GHW/iJCMA44bQlOrSfhpFSx8c8XWJon64u4XZVY+ixucHOuny9w+kL05WC/
-rKb7YO3z9+EGKSn1xxd0BxDCwFPrg4qdg8IgtJykQwSBrPE5DKAD7+2p08lRvfdO
-p4vA4wIn1D2I4ET8zOq7TBQqU/kfIGRynoLhjcptjdNM1zAREqwyesT0jU6QDUvi
-syCVzJzi6xl+ZaJsXlg0uunxnEjXpjALqnbwaW6RggMMDA4w3sVk
-=Ag/M
+mQENBFWdjzMBCADYrIC6o5lqDkAGrEIy9v1ShIKkUbdhkGH6ub0DnYVdS63NLydv
+ZLs10ww6hs+urqJF1SjdGxiAAOI2PoQzo0CIRlFROgcVH5elTT4z7GuchSSr4i4x
+ZCv03rkhAUDY7hXy27EUeVI+DKAkdV/r6fePXnC8f5l5Pk/g7N6sILx4hTl0RF3r
+oN5zY2V1k9XlX6jHu/h78AIbJ62YpyNCL06zgz5/FdU4ICim5RsRli7Hm/Ny+fYz
+rTvRh2mFkBTdZNPS5YiO0gK5gm1/cX8sgly4g0d7G8oYBXrLzepUg/1FdjRjaaJN
+kiCW7BVOvQ2gNuyyU3sEvt4SEz2rSV6IIkYbABEBAAG0HUVkIE1hc3RlIDxlbWFz
+dGVAZnJlZWJzZC5vcmc+iQE9BBMBCgAnBQJVnY8zAhsDBQkDwmcABQsJCAcDBRUK
+CQgLBRYDAgEAAh4BAheAAAoJEF2anDtD7vCZJUIH/3TMLGLsEPHR1f+/U5d/IOmX
+GZw/lMe71j765c3K3Ez4gmGIwD/qN9708tMaGsDE5lWK7fwDDZgIcPspxb7I4C6w
+fvvIWbSWs9FAw1Dmq7brENe88yZ4vjk0HogYzyow2OP4qDFBNFGawFuy1sNVQp+Y
+R9ZcrDTOZpzZRESuR8sqvCENBcunhrpgEHq3CVOAc4e+U7xS5W6wlIhMhIXqIIKL
+tECb5IzJ1tlXK6XHLt3sS5P17NnnAs1FtGdWFO2OJ8BFlIKtAZXBaX5dL06NieJ4
+g95NIcnR55RCO8hyiG2fObgtahtHtSJmOuJrGbSrS5iW0WuUdrM2Dea+JZBPfXW5
+AQ0EVZ2PMwEIALbOjhDPMp4SHSEQ6VFkJOgeLyZfV7ZrwbLoVihQbmg6inuJ4pjt
+oTKCkmkKtFZwViNZKET7AvhEAiWGj7yQIkViC1t7ObZrTXS7uvxTN6KuJMQis6l5
+wTMXPZmMGI/ITEx0d//0J8wmJUcS2fGYUGO3k5/LExPUYexOye6VyaUfyYDMZmAC
+6RE6kNo/tSzYwk/NlrBuyrWmvE6sdNrwa8Qzpia/n0El7qCrqGKceyoMbFBgDr7Q
+k8hxbS5T0vh1eqQiwQ69mjaALYGe+DsJwV7hxrjv1yhYBbUrw18+ao/9ARZWWQtc
+07VVnsuXbEBIoht2WIslcgmzcnOn614tE6EAEQEAAYkBJQQYAQoADwUCVZ2PMwIb
+DAUJA8JnAAAKCRBdmpw7Q+7wmeGhCACdqwWt102B4ba9+GI3RNyxXFBfl6FgazaX
+ZoVjQ5IyuxAAWG23fDiGN1VSQL7k54l4c0CPOCLTcQmyVQvGPtRywIGpoaRiHwtD
+p9ji/EeNbiIupMP3rsXIs3CrQ2+L7DRLDEYkLy7BKZrWTTEjKEh7S4qju9FGXUnk
+zbcnqmuDWAt32JZ5G861C/qdl+KvcDUucY+2aVUnsHxbSmS/asUbQjrRoCSof+hX
+9QrnCl5xEtKGxLGenAL1daGRIVwZhLQOxl6K56KgIjBKpWXvQBSaqXd4X4R8LmFK
+F5yecKx4DTn/PvOCRTyvDtbxbQ29WXjJQgUgkLutAKK3hTTQpwWL
+=Muz+
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>