diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
index 9a5d706dab..467d7698ff 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml,v 1.82 2001/07/25 20:30:43 nik Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml,v 1.83 2001/07/26 01:43:37 brian Exp $
 -->
 
 <appendix id="pgpkeys">
@@ -10,10 +10,8 @@
   <indexterm><primary>pgp keys</primary></indexterm>
   <para>In case you need to verify a signature or send encrypted email
     to one of the officers or developers a number of keys are provided
-    here for your convenience.  &a.wollman; maintains <ulink
-    url="http://people.FreeBSD.org/~wollman/freebsd.keyring">a
-    complete keyring of FreeBSD.org users</ulink> for easy
-    download.</para>
+    here for your convenience.  A complete keyring of FreeBSD.org
+    users is available for download from <ulink url="http://www.FreeBSD.org/doc/pgpkeyring.txt">http://www.FreeBSD.org/doc/pgpkeyring.txt</ulink>.</para>
   
   <sect1 id="pgpkeys-officers">
     <title>Officers</title>
@@ -1002,15 +1000,14 @@ cDNHXTm/xwECfjDHjrJA8Qg15NZeew1tjLoR8naJUDI0CetBbvs0mEUGwjySDzov
 ta1JwVq7zIhGBBgRAgAGBQI57li6AAoJEF1SHIzmsVAWGx4AoN0XDe6xdktWsoej
 fSw+/aM108z5AJ9GqM/+F/Exr5OnknWCPjFbKSBO4A==
 =BvSg
------END PGP PUBLIC KEY BLOCK-----
+-----END PGP PUBLIC KEY BLOCK-----</programlisting>
 
-
-pub   768R/7EBDECB1 1996-12-19 Josef L. Karthauser &lt;joe@pavilion.net&gt;
+      <programlisting>pub   768R/7EBDECB1 1996-12-19 Josef L. Karthauser &lt;joe@pavilion.net&gt;
 uid                            Josef L. Karthauser &lt;joe@tao.org.uk&gt;
 uid                            Josef L. Karthauser &lt;joe@uk.FreeBSD.org&gt;
-uid                            Josef L. Karthauser &lt;joe@FreeBSD.org&gt;
+uid                            Josef L. Karthauser &lt;joe@FreeBSD.org&gt;</programlisting>
 
------BEGIN PGP PUBLIC KEY BLOCK-----
+      <programlisting role="pgpkey">-----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.0.3 (FreeBSD)
 Comment: For info see http://www.gnupg.org
 
@@ -1282,9 +1279,9 @@ virdAQH7XQP+JI0HzuV4ycNw2rnLU4iNrINsC4ur5hTW48CQcX8/HFkTuygzFKVn
 AlrKEytdfJPaFMt6UAqUPB+NPJ6fwtJkU0cNsjCsZIGBh8AumyT560BWYm3iIac4
 Zn/9dKslg+SRJZU0T/A+Iip+3oFz8cl7BrkPgI1mLvUTOuBj4Kre/7k=
 =aSn9
------END PGP PUBLIC KEY BLOCK-----
+-----END PGP PUBLIC KEY BLOCK-----</programlisting>
 
-Type Bits KeyID      Created    Expires    Algorithm       Use
+      <programlisting>Type Bits KeyID      Created    Expires    Algorithm       Use
 sec+ 1024 0x5BA052C3 1997-12-08 ---------- DSS             Sign & Encrypt 
 f20    Fingerprint20 = F829 B805 207D 14C7 7197  7832 D8CA 3171 5BA0 52C3
 sub  2048 0xB4E60EA1 1997-12-08 ---------- Diffie-Hellman                 
@@ -1294,9 +1291,9 @@ uid  Bruce A. Mah &lt;bmah@acm.org&gt;
 uid  Bruce A. Mah &lt;bmah@ieee.org&gt;
 uid  Bruce A. Mah &lt;bmah@cisco.com&gt;
 uid  Bruce A. Mah &lt;bmah@employees.org&gt;
-uid  Bruce A. Mah &lt;bmah@freebsd.org&gt;
+uid  Bruce A. Mah &lt;bmah@freebsd.org&gt;</programlisting>
 
------BEGIN PGP PUBLIC KEY BLOCK-----
+      <programlisting role="pgpkey">-----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: PGPfreeware 5.0i for non-commercial use
 
 mQGiBDSMdS0RBADQE42S0MDRcjiuM4mPH4NL2m60OMHgq3mYuIzrNkRE4jSzZJiG