diff --git a/share/pgpkeys/gahr.key b/share/pgpkeys/gahr.key
index 054a081828..d84ca6c23a 100644
--- a/share/pgpkeys/gahr.key
+++ b/share/pgpkeys/gahr.key
@@ -1,14 +1,14 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh gahr A192089E;
+sh addkey.sh gahr ADD0D38EA192089E ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   4096R/A192089E 2013-09-23 [expires: 2018-09-22]
+pub   rsa4096/ADD0D38EA192089E 2013-09-23 [expires: 2018-09-22]
       Key fingerprint = DA6D E106 A5B8 54B8 5DD8  6D49 ADD0 D38E A192 089E
-uid                  Pietro Cerutti <gahr@gahr.ch>
-uid                  Pietro Cerutti (The FreeBSD Project) <gahr@FreeBSD.org>
-uid                  Pietro Cerutti (Medacta International) <cerutti@medacta.ch>
-sub   4096R/408BA46A 2013-09-23 [expires: 2018-09-22]
+uid                          Pietro Cerutti <gahr@gahr.ch>
+uid                          Pietro Cerutti (The FreeBSD Project) <gahr@FreeBSD.org>
+sub   rsa4096/3AC8004B408BA46A 2013-09-23 [expires: 2018-09-22]
+
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -37,84 +37,54 @@ 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
-gAULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAUCUkBe0gIZAQAKCRCt0NOOoZIInuRc
-D/0WO/8soYm7FF+6yBZT2+K0xVur6UvOlE+BUjuQJqiY+aSuN5Z2l1ctDop9qAS1
-UVTKJ0jnZzGz5o7f5+v0aJp/51gWWYEzIiCnNAMPj1pRxhDRTzBoMZUYXGnak9oP
-Sv3XgiwE6yso7wrE86LGy0SSatCZurn1dz0sP8TRBN74359CIyoPgrfuJNudf4mT
-TcmvWBKVhhITK4NiMOOzriAtNtVcI7Ne9OvoBcm6W5LTc8xJP38TVI+HFZ3hGlHU
-hWratYfzRPqS6zl0JK5TwHw4wxtriOYzBA8lSJ6LnXpYh101uGB6QxxoHX+ywmWD
-3mmChBj7eUMi0GhUBzgwNVUJJ1X7Xjcpcg9xrvArEGJAQPTDZlPRBs+XCMRovqB0
-rTVEJ2mO6gBpBcqshQIw3zJr4pSyuiyoNyOS6vxHVzPigyLM99n+a+zK6IFi7UBG
-0bmoaHP08v9/lhaR+DwTqsFAmFnCjYvDbqkfZWbBFY9uE5Ts+SLpzUKJSS8zkWqE
-DvlqwABUWp7snamfgX1tkDkCpWFvNm16EwSZ6YiyCkQs6KgM/JbY+D8fRgI7gjCa
-WFc4uPt6oEiXCxBLNhfB6poR5kNyZRur8DaEROXCS+qc/LMQc/809JX2/ja9NFQS
-eEvrNTsDbBbQwEAyCGLNuTdDp41YSEOCKoGHjKa18vPJLYhGBBARCgAGBQJSQF/E
-AAoJEMDCapiVcfeOYA8AnRbxxp6FT7gzNx07sGDL9C8S+p6XAKDXupzGZlaDEUlT
-sz8EyZH6IiqEULQ3UGlldHJvIENlcnV0dGkgKFRoZSBGcmVlQlNEIFByb2plY3Qp
-IDxnYWhyQEZyZWVCU0Qub3JnPokCPQQTAQoAJwUCUkBeMgIbAwUJCWYBgAULCQgH
-AwUVCgkICwUWAgMBAAIeAQIXgAAKCRCt0NOOoZIIng4cD/92ktpVrcoHIO3utD3C
-fch+uKFTBm2M2TfPLdqPvHd2/xbRv3dR8g/qR34a22cQowiv0iVPH2vlw+jDQdQK
-Q+0fUnSaVnaTiaiRvFP1EE2T6VF7/i9pc9lf2LOJhpLsYIqY/0PJxF3PZbgbO5g8
-8wZnz2Ad/7yWDtyaawCQ9LPCWNmkcenHwJqhe3g2Gr/22BqN4mnOWudgk291B40i
-mu/dt/D6fwETJsVypiR2HjX152cu/ohSnksAVwaHLKN9A9a52JraJ79oEXQzV4Ei
-Jnejga9ZNItvtno9tah63ubYOezTaiA4ilFLdnr5+zs/Me6+ByDgVQG+p/pGKsJy
-tWezigR2eTtSjIn3CIYOZfwniC8DgwgPCblT1WXU6mIx8OdtU1i2DXmnsSWxuwdT
-zgdtxco3pXkOS0yvF1jSXm7dDkULMCxYSpLbjeDCPF1SNNpPyvGOnbmAcB+1Ur/P
-QQozX/y54/waSdpQYzFeF/8Phiq1duzqN5VQyOUSGhWM5/PdXXchbrX7EqW8eRND
-zfDGPwg1fR6urDBAWoRaUzIIbcIsPBh2Bcx0zzeh1ikEyQ5HQwuefDf8YX8aULrz
-WTxDQ1Y8jebK8iXFShUXpt8kKvR4pQ7So+PHywfM1fpAUDjqkA5Lo0pk23LGpN1U
-zwlDaOrD6BIY1UZYaqbzJPZNAYhGBBARCgAGBQJSQF/MAAoJEMDCapiVcfeOzHUA
-oJ/50IcPYgwV6uBSd7rRLMCb9Y+qAKDLnF4lnGzTxjYJ62Pn8pfhWpRhOLQ7UGll
-dHJvIENlcnV0dGkgKE1lZGFjdGEgSW50ZXJuYXRpb25hbCkgPGNlcnV0dGlAbWVk
-YWN0YS5jaD6JAj0EEwEKACcFAlJAXmECGwMFCQlmAYAFCwkIBwMFFQoJCAsFFgID
-AQACHgECF4AACgkQrdDTjqGSCJ7CUQ/+K9IBVAp2FMFi/52ULzvipBvUIaR7p0D3
-+vOohYtub0dvKyXgo++n+jGoqRVFstR8ow5GkKybnDyaayBFD/A7nKEYn6tnTzJm
-l4upmBHbmU8a9tA4KtduKagjAMjbrmifMSN910vkeM486SOcwzYSOXmpE+b6MTz7
-5Junf2kLNx/Zbl0pp9/upcayTuHYgdl7BDhjAyGEO3rP+yfro1ZcdhPVoQ7/nj5c
-u+lfBtVWOphDbc1G8/ashJLhkZz07SnfRz4tzjpmfp5ohBne3OWKJQgeQZVQRfI/
-4A7tmZ6cHDDdafJFof5DBpHN4kNuD9YLhs9MMalbZhbMKS+SNxQA1UqVq3cnFIGq
-H+1av2X02dXKO0MVLpW+sWsmH3gL7MuAGegJpqOig7kIjzHnJOZwqnQ4iUNB3j6P
-akidYhEAPGBsZ4sDP/DuxVIe3JYzmSHYWDwJoWoZx9qqB+YcWYpHS5peShUV0rJa
-gD2pJ3GunqBbAg87EcBFHwAAfYyq/KDvLGGrIVq/VT2MiX5Ap+HELNim9O+yWZg1
-HevPw0C+3RVwqOOjm+dkP7cTd9I7/KYcrAWHaQpVj/k3eI3xhzwBdIF5E7blhG9X
-AgjdIFz3wIVP0TW7Yg9HsM4fP9j57iSLlQ4+twIihUAyZNIcMvkh9xrbMWXxigkt
-FWCgCWUYnyuJAj0EEwEKACcCGwMFCQlmAYAFCwkIBwMFFQoJCAsFFgIDAQACHgEC
-F4AFAlJAXs4ACgkQrdDTjqGSCJ4j8g/+OL8tYWiC0WYJg0pWUtqnxF5y2ptNPbt8
-wkDaDK6eFhKebQTlhJOKxreLaz4DypJZ8mBaqb4Z7CQQc7IzIbgpX5+qz+06EiPA
-gMrrX6kxlBpXCTFd9K7R3hpZzmL7yn3rjsbIDTPS2Qh9LOF5TiHCwS8gzZEkD1GC
-AOoIepbxNYf5I6Di2bLVjyT+b+bzudcusca7PpTpyM7AlSSLrlE9i/DnN3eOYhXe
-RxdRZppksk9g7c6ra+eFL/FfOV06/Wk2JMGELiRA5+sCv6SUEbW4rd3Lr/kGjjyG
-jnGzydgNI3nZbjos2wyleuiaZd7abDJ8KKn7vylbUM5F/okbWBfq5nJNiz/qFtpl
-Bw3i4GrR/KX85/k/bfJD5a8yPA1s1QVM3TqrDFLRQ6uby6jAZA5YJYxoQTroxtn+
-wp9szjBZldfEAySlk/WdAKYf89wx5A1Vc+KAkmTQBDem78oEV/aG1Z4q+iGprslE
-XefPFce9xDxV8CZvKOBTQ8KDs5eGI1Jw3smoxfTK7Lz5P9RvC6Jr3GoE8tHNFDU9
-IU1JPLOBIPS+8JRKY2aVhce51TSIzkI8MZrX+2f9FyLYq8EAqbDPzanyla3NEzgm
-Kw3gzbriQ8nmKrZ/QcjI3TUk6WhTSZMt6YXKqkKivbopB911iRMUT80sowpWWDjL
-FVZ/c7y/Ad+IRgQQEQoABgUCUkBfzAAKCRDAwmqYlXH3jtkrAJ9opgEoJZFoYTAN
-ocrftH9/He7cQgCgtCAcyn0/BB/JIHsrjLdUTMKNdce5Ag0EUkBfAQEQAOvI2gwM
-MqkDxnPHFyKUHtb7a1Pnu2U4+IbE4L6Cfix8uwzLOHdI6eNpMMSVjINaEAbECDiD
-0ynSWiag/Re2vXL7nLJR6PVv1M1BGTC+1TKuhT5wAYDl/wnA2jyJtjxoUamX6+Gq
-Qp2XPpoV0Mh66HDD8OpA9/Xif/U//JQ00wxA5q3xggV8ke1EJreuahFhk7l2ymQI
-Z016+GggXQ/Z5yQ/ZEqtf/gWzEZyMj0lDhkzD2OZDVzcVmlewnUUcPYaE7XOAo5W
-OIkTEzT6+1Q9CS/MI5/UhD+OtIL1Y+YsMDpSdxtQtdTqEnJSOTfcmGyN1vsrSiC1
-Kf54PniIg+BhVR/fiylJRWM8jumfHfeycsTR9Q6porHCfS1bRw0MShV2YLaypZZm
-wqEBOdkcwlB/C5b9dHkG4sMXB9Tp1QkeCPTANrZhmhPRa4V+1N/iAay13f2mlf/b
-aojKBoE90LG19nWwZNXQXpwinCJGmFab2PjuHo+xVB6MfxOqkfcFNDeHGzAJwUYp
-zOqYkxfW9t+aEg6RcrOMEiox7SJ2gbAjGihQYlf8zwTvCrdjpLCnrOU1r/LmypgW
-lpH2xNQDGD390q4+5I2N6FKHyf21x0rqrWqQa2TCnrXCfpbBF4aAlp8jTl7u7z+K
-4q3QYvXl/Vo0afcacEwo1v0Q4HajJf7vMOJbABEBAAGJAiUEGAEKAA8FAlJAXwEC
-GwwFCQlmAYAACgkQrdDTjqGSCJ7l+g//ZbYQydENW50xIw1MVqwVXDoQN3N7fVTE
-fCRtPgE+RQzRSsJe+6C8SB/v7/R871UREZHoVuocadtp6ns5HpU67/XqImfIK1b/
-QUJGRGkFjlAQceUtsovmcJEPmmH/hgFR/uSpUwkLeoQcXqOZjDczRQeqrmMuBwgE
-FZBczCyKsZRvRKDo2+NgU7jwPZq50B+YZtp4qUmB90s/w107j/PmA+u1vpqY0JUi
-ZZyVQZb+uAmp4x80uW9plASIAv/mgX3fsRSmz3nEG8KQb3qOdDVlCxFYghwoyEmL
-krOlQG1yvoJy8QQbq5fU8de9DvhYKBYDVkj23BW7OEnBktLsgpOXIEW5OKiJZ5Tf
-6VMQrIWmzzgSPlKAzMungfAjPlMSivgI8qV0wfdUHNeGnX5vH1MrFd/yYLD8TjDn
-uNqnbtn6DjIRG96wELm+WCT5S8/hQ6Glt2Srgk7EDVS9MsB9Tyay+oaDk/+G7+lX
-hhzy6a9WkQh+jS+QyYCaEBj9W+4VInm6TqBAtMRfin1qZQQcX+HxL1mvG2vSaL48
-zwL6czLOF5lYTCEyxln/GKasbUBQlSviuVuh7LuWpwXAAG2aLnSvH7hNkU1m+R51
-8k6F23zyLF24ZPcMCy3Z+a09EZ+CvgOEdDoc/5Xm7sPsPTbfHGQYbSyqCLrpNhNO
-0CiP9PEfnns=
-=fOaQ
+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
+ZBhtLKoIuuk2E07QKI/08R+eew==
+=GZRb
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>