diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/benno.key b/en_US.ISO8859-1/books/handbook/pgpkeys/benno.key
index f76f3ad56c..f2bf898254 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/benno.key
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/benno.key
@@ -1,63 +1,78 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh benno 15BE120E 87C59909;
+sh addkey.sh benno 87C59909;
 -->
 <programlisting><![CDATA[
-pub  1024D/15BE120E 2001-01-15 Benno Rice <benno@FreeBSD.org>
-     Key fingerprint = E786 5BF6 A296 5F77 E3DA  7493 6D0C 7BC6 15BE 120E
-sub  1024g/313F3AF2 2001-01-15 [expires: 2002-01-15]
-
 pub  1024D/87C59909 2002-01-16 Benno Rice <benno@FreeBSD.org>
      Key fingerprint = CE27 DADA 08E3 FAA3 88F1  5B31 5E34 705A 87C5 9909
 uid                            Benno Rice <benno@jeamland.net>
 sub  1024g/4F7C2BAD 2002-01-16 [expires: 2007-01-15]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.6 (FreeBSD)
-Comment: For info see http://www.gnupg.org
+Version: GnuPG v1.0.7 (FreeBSD)
 
-mQGiBDpikIcRBADDVeCRQ1aPvgIjJy6CTmDXjzSS5J5cxWaGhbA/UGj5NPj48cqa
-FTR3A8/ez+Ui01RIRStEMaGrpkDNSGkllaZnyTAIW6ozIp1j1UD27mCEA/I2PB5I
-B81jrkUkQOa0SVyXfx5livFQ8qup7p/g2Onej99iQwaHYk4XMTDMhZvk7wCg5QuS
-rNR071oflpT+Ysxie3R8Kn0D/0o3d0TsACLEKDKHZcsKT4OhrbIPfQp1cWh7+XC4
-wqItBjXHWIdXMCeS/N/DYzPWAFZha0e8NHxqCCQwbdpHdX+6Sn3YwVEPMlPA3i6r
-5pYuDPj8m9QpLWYu/AXwEF/KMwKYPz460IT9YHukeiOzB1q2VX3glsEr1DnRzckD
-WAxyBAC28HVDH/7XS6L5bGeZouPhY7uX4XoHeZdpcWI3jS9dBwcKjmXieVQMIh13
-ZdO5zXrxCXoX6sS80kpxa1WfTs+VMlMuEYUP2H0bp6XjDHHvhOKEj4CO2ysPTRzR
-TQKyso4TO3zxg/yjDT4QLCtbmHvTvVj9I/duP15FmRRUQMxnMLQeQmVubm8gUmlj
-ZSA8YmVubm9ARnJlZUJTRC5vcmc+iF0EExECAB0FAjpikIcFCQHhM4AFCwcKAwQD
-FQMCAxYCAQIXgAAKCRBtDHvGFb4SDo+TAKDgTB5nUSx/3me0QKSw6pinfvGGLgCd
-FoGtOhnXL25I0HgEGBDS+tqHkxq5AQ0EOmKQqRAEALWN6zMxyIlkNHiagyWfc/qg
-EgjfbD2yiXIvR/CRZqWPKE5LbtAeCNc6tnfYeQSIZz5cCZs5iImafHKf4r5CvzZd
-Rxrl/2FngjAAMCi99wCuOBZX2h1ruqrI3mDqaWBRiGWEeu58+CllZdH0fpfAnI3r
-cJowZeBj8Ss1QZsVzeyfAAQLA/0ZwjK242AXkXjibtzEfZqK7l22D9xIT+ajc6zP
-34F//PlyRVijEbWII/wy6k5wNLXSVUoDhEMucdsc1AXJ2CQN0nJPyETlhvTpJidh
-/gwDrNVtvPCOt/VleX+C2lI4xGW8Dx5pJkoULhgmsdjxvo2blRpreLuGhsU7oU9Y
-7d/fJohMBBgRAgAMBQI6YpCpBQkB4TOAAAoJEG0Me8YVvhIOT9EAoKloqPBTtp9p
-JAEew3wXXri0oNIvAKDP6fbrVo2vbD2iZXw2m3Y2E/z5qJkBogQ8RQ4MEQQA0gD1
-10Ug3kvI19MqLpz2fHT0lvVAUgp/RioMld+6uq68Gh5UpgrKVEy//dofdp4aLC5D
-WvF6uD+6GSdTVIozxiFwMbsDo5BNpcQT/tCsc5I63NBRf2UCunKqVY7a0whgaN/o
-pur/3cNlJ5iCzNRq1fk6XJk78hjCY10+FQfsbYsAoIr+ej1TOqgq3eadzV5b3mom
-KF8DA/0c2tUKGzxh5aV9IZI+2z0tGAKTRGPBfNsmdLwK2DR4kO5VFvsC1i9/v/of
-zvE+rYxOxXinaCPflPxEPt7SG1FaQ1m1ESbSVcghP6w/zPZA418af++GiAkiJUcT
-zAPABgD9mb+2uBmSJYQVZg7t7SpQ72rVIkVPRzwAjmakFBaUfwP8CUQ6+uCAgOfz
-dKgd3vUYMYOui3IxZeNI8DNR3f/HOiZSxP73HaMHKsRz3chICmaCaCmDeWO1l50F
-L65A+Tt2+vDBnyUY5b8QjC/snnQ9JQ57cyRNjvDUHQE5wXI9Qq2mlx77TebHXcPB
-rYoev/KfN+X3LEMq/1dQSoaExgk7ZKS0H0Jlbm5vIFJpY2UgPGJlbm5vQGplYW1s
-YW5kLm5ldD6IXQQTEQIAHQUCPEUODAUJCWYBgAULBwoDBAMVAwIDFgIBAheAAAoJ
-EF40cFqHxZkJg9UAoIJ8WvepzfUzs9mi7FUNqrM8MwQUAKCByhQvCV2D/BR9HwPd
-cy53Hlniw7QeQmVubm8gUmljZSA8YmVubm9ARnJlZUJTRC5vcmc+iF0EExECAB0F
-AjxFD3YFCQlmAYAFCwcKAwQDFQMCAxYCAQIXgAAKCRBeNHBah8WZCZaMAJwOJ+fJ
-4JGuF+snGQqV6GDUbtUfIgCeOgcxN+TCybYCUM7Rkp1p4KC4Qla5AQ0EPEUODhAE
-ALuc6m6aUzPe+XHGF8QlMdjhAgHc8aEoLCXt5Lp272TksotvLeFfh9fueJLPADpY
-oTeVwYGQEdKISe0U3v+ZfxFfa2XGPk53++VLJC244n82T0MXfc2GdrFG7/aCZ1/D
-kYqYSESpX1Y23vLanWnsUN/NhUMFFXAvsnNbtmHub333AAMFBAC5avye07x17Y3m
-OAYCrAKQMRs8n+K6D7lwA7qwi6Gl61HJVLFNyljhTk6Fvq8UEGAI89U/5V0jhlcw
-wmkH+iFSFgWBFbt2VkyPP2pqd+4aC3YolP8dFVlZII8n11U3SHbJpw2qEwFavq/i
-ciLm80XK+/UqThCKOWz5fpJv+kf0t4hMBBgRAgAMBQI8RQ4OBQkJZgGAAAoJEF40
-cFqHxZkJBksAnRB2SZ3rOqs0ii+m14ga9L3gkkDaAJ9Dw2Gwrog4LmhDdOdig60q
-A75OEg==
-=5q1y
+mQGiBDxFDgwRBADSAPXXRSDeS8jX0younPZ8dPSW9UBSCn9GKgyV37q6rrwaHlSm
+CspUTL/92h92nhosLkNa8Xq4P7oZJ1NUijPGIXAxuwOjkE2lxBP+0Kxzkjrc0FF/
+ZQK6cqpVjtrTCGBo3+im6v/dw2UnmILM1GrV+TpcmTvyGMJjXT4VB+xtiwCgiv56
+PVM6qCrd5p3NXlveaiYoXwMD/Rza1QobPGHlpX0hkj7bPS0YApNEY8F82yZ0vArY
+NHiQ7lUW+wLWL3+/+h/O8T6tjE7FeKdoI9+U/EQ+3tIbUVpDWbURJtJVyCE/rD/M
+9kDjXxp/74aICSIlRxPMA8AGAP2Zv7a4GZIlhBVmDu3tKlDvatUiRU9HPACOZqQU
+FpR/A/wJRDr64ICA5/N0qB3e9Rgxg66LcjFl40jwM1Hd/8c6JlLE/vcdowcqxHPd
+yEgKZoJoKYN5Y7WXnQUvrkD5O3b68MGfJRjlvxCML+yedD0lDntzJE2O8NQdATnB
+cj1CraaXHvtN5sddw8Gtih6/8p835fcsQyr/V1BKhoTGCTtkpLQfQmVubm8gUmlj
+ZSA8YmVubm9AamVhbWxhbmQubmV0PohdBBMRAgAdBQI8RQ4MBQkJZgGABQsHCgME
+AxUDAgMWAgECF4AACgkQXjRwWofFmQmD1QCggnxa96nN9TOz2aLsVQ2qszwzBBQA
+oIHKFC8JXYP8FH0fA91zLnceWeLDiEYEEBECAAYFAjxaJggACgkQo8kg3R/NoURX
+hgCfY64+KES+rcptZLiA5hoAvX13gsAAoMOiUC/0Non6V/srofbjO8HFM/IziEYE
+EBECAAYFAjxYkvYACgkQDCFCcmAm26bQlgCgjapRIU7hMjz5HBnZgNr418+JVRkA
+oI2DYOP10H4gBZPwT574rkvlrXiKiQEVAwUQPGs/CGfCgI8zwWJ7AQFkGQf+LQO4
+gNf0j9z/LIyKA2mCT5C8Zjh0h7DmRxiiU+4N+bIUuZy7hSVlyWnJMG1JTKMiK1Ss
+nUReCTkNM70rBnxOQV3BlcHksb9ZsrECy8icfslRJGpQmQlrUxppHSyb7UJh5d69
+C5xpDEFUBpTgSZw5JKDOui8gZL14TcthoP5vuj9geo+DWWogyYq0umiaZSDzGeSa
+ST6+ebL1ne+F8hVdxSHcTChFVfrHDWdgAhkGBantTsfbETTwnBHH/k+INu6LxBkC
+JAZMw50vKs739Z+Zxx/gSRd2CDnSlUsoMgJGKLX5MGWmCqEPw8uyBT/T9t8GOAg+
+sx5XjhBhe3PmVPTKNIkAlQMFEDxrQDpVLh4uc9KIpQEBgk4D/RaNrMtwjUoITVdY
+UwNLGdh2JC2d3pM2b0DUoL1rcXwctmc5z3I5co2c/r9k00PGzWv6D3LYboTd/bxk
+lPvn+6uIYmisl7CknFnCLO7lbILkEBGpQHE/8Z7EAI2zUZ/bi3VKcKAFooNPv+2p
+HteKkkVc6z82BWCI0bzH+v/Z0Yu+iEYEEBECAAYFAjxrRMMACgkQUgAclY4JAiON
+BQCgiIf8HrEU/qOoM9BMRwW/1RYeVhIAnjWu/jgHWJVvdPpfG4UIJKpk8DaliEYE
+EBECAAYFAjxrRR4ACgkQjDKM/xYG25XSygCffF0SdJ+WNXkxspiC2BzQAldql78A
+n27raDOotEaHxv5/qatznaWJja5UiEYEEBECAAYFAjxrS7EACgkQGPUDgCTCeAJj
+kwCfa3fOqwWcLbVO9we8um2rkZl4qZoAoKLH4FUXz3qldvVyRvhbSlDWGwP0iEYE
+EBECAAYFAjxrS58ACgkQIfnFvPdqm/WWRgCfaGeUlRGzWSQQZzg2pMz+eC/yFuAA
+n1+qQO7UVEzxTnoD3hAg1T/mLsaDiEYEEBECAAYFAjzPTrEACgkQzerIIuwxO7XE
+yACg5rmr96yl/M/qQ3DIFrx/Md6eJYAAoOStOGPS/9Fly4Dv7T9Cx7Dsz4QDtB5C
+ZW5ubyBSaWNlIDxiZW5ub0BGcmVlQlNELm9yZz6IXQQTEQIAHQUCPEUPdgUJCWYB
+gAULBwoDBAMVAwIDFgIBAheAAAoJEF40cFqHxZkJlowAnA4n58ngka4X6ycZCpXo
+YNRu1R8iAJ46BzE35MLJtgJQztGSnWngoLhCVohGBBARAgAGBQI8WiYKAAoJEKPJ
+IN0fzaFEho0AniKI34jtQurc2v0PlnTAze7AKRmmAJ0Qfp0DhFEbuWqv2dJbJCnh
+9wYOs4hGBBARAgAGBQI8WJL6AAoJEAwhQnJgJtumuDgAn2NODtyfzrThSVz9xls5
+A4CrpDvHAKCywVtdpH4aYFNtHZPt48wxar+mgYkBFQMFEDxrPxRnwoCPM8FiewEB
+nH8IAJ6w9TU1kRNm4ifVR9yp3/FMBZXNnor4FykOjOZISowfFGY3wwNWGnbCSa7B
+5spkDiqnBFwMwbcTQXo56OEWNAir0hAkUEQD7GUMcZmEWy8ZaQIedN3SHhydfR6X
+aNar7uHyi0yi19sgq1/Jnu8DLsPio75gSv1h95anIvoGE1YpkTNGemQ6SyGs7rQ5
+7QuYXqN6P60cJLC0kwEZ4YbcN1OuZ6iSj31TDVp8EzDCkFm6eMQ0wI6UPpdlymxE
+gfFAV3oDlj4ZG6pzNw/ZcvQFeqMNgM+c0j+omZsFlPvW4wfZAV+cevVV5ATosYSd
+PMas2WxPXG7pAwhyRIgyq33/09yJAJUDBRA8a0A+VS4eLnPSiKUBAWl9A/9kN+3x
+nxr8iU8sZMef8PpFMUNj4gp5ARDw/Q3Sx7jlGJEyuLGbeH0Zu/mTvpV6vQzcm3NQ
+EB51WQx8EmizIbtX1PfpyRgKLOXGll0M8D0c5JOdZAAAXYVa6AtFm36rZ9dbM2UM
+XGNClNt9zXUXK/sufCVC1z6vm87I+RJOUhF91YhGBBARAgAGBQI8a0SzAAoJEFIA
+HJWOCQIj7r8An2XwJ4WHnootgfqCUcIfbr4y70QgAJ9ngcIvPy1q8UKMdLk/Y5Ti
+V8TlE4hGBBARAgAGBQI8a0UkAAoJEIwyjP8WBtuV9uMAn0BBM8hO1iCUp9UD8bQ3
+Ptp3xrC1AJ9Bn+yVzTVl1x55X71sglUWxtQixIhGBBARAgAGBQI8a0u0AAoJEBj1
+A4AkwngCupEAoMzM2E10s/451EDjYkdr1fKo9tV/AKDfSYJ2vOJx7JzciRfj5hQJ
+v+81GIhGBBARAgAGBQI8a0uiAAoJECH5xbz3apv1pQQAoNKsi+LOvlXM2GGkzQoY
+Pz9xDxs/AKDgm87TPdaMYhI2P0AzCTHJenYalYhGBBARAgAGBQI8z063AAoJEM3q
+yCLsMTu16gsAn2OJb5oK/QYgO0EpREcYF6EVOLegAKCipUzr16GCumxYGj5cEngb
+7ZkFfLkBDQQ8RQ4OEAQAu5zqbppTM975ccYXxCUx2OECAdzxoSgsJe3kunbvZOSy
+i28t4V+H1+54ks8AOlihN5XBgZAR0ohJ7RTe/5l/EV9rZcY+Tnf75UskLbjifzZP
+Qxd9zYZ2sUbv9oJnX8ORiphIRKlfVjbe8tqdaexQ382FQwUVcC+yc1u2Ye5vffcA
+AwUEALlq/J7TvHXtjeY4BgKsApAxGzyf4roPuXADurCLoaXrUclUsU3KWOFOToW+
+rxQQYAjz1T/lXSOGVzDCaQf6IVIWBYEVu3ZWTI8/amp37hoLdiiU/x0VWVkgjyfX
+VTdIdsmnDaoTAVq+r+JyIubzRcr79SpOEIo5bPl+km/6R/S3iEwEGBECAAwFAjxF
+Dg4FCQlmAYAACgkQXjRwWofFmQkGSwCdEHZJnes6qzSKL6bXiBr0veCSQNoAn0PD
+YbCuiDguaEN052KDrSoDvk4S
+=L0S4
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>