--- web/www/pgpkey.xhtml	2004/03/23 23:43:23	1.6
+++ web/www/pgpkey.xhtml	2013/08/09 23:38:42	1.9
@@ -18,13 +18,14 @@
           </h2>
           <p>
             This is the public key we use for signing i-scream software
-            releases.<br />
-            You can also download a copy
-            <a href="i-scream-dev.asc">here</a>.
+            releases.
           </p>
-          <pre>
-<!--#include virtual="i-scream-dev.asc" -->
-</pre>
+          <pre><!--#include virtual="i-scream-dev.key" --></pre>
+          <p>
+            You can download a copy directly from
+            <a href="i-scream-dev.asc">here</a> or you can search for
+            it on a key server of your choice.
+          </p>
           <h2>
             i-scream automated build pgp key
           </h2>
@@ -32,14 +33,15 @@
             This is the public key we use for signing automated builds
             on our build server. This key is less trusted as it has no
             passphrase. We will only use this to sign things such as
-            snapshot builds - all proper releases will be signing with
-            the main key given above.<br />
-            You can also download a copy
-            <a href="i-scream-autobuild.asc">here</a>.
+            snapshot builds - all proper releases will be signed with
+            the main key given above.
           </p>
-          <pre>
-<!--#include virtual="i-scream-autobuild.asc" -->
-</pre>
+          <pre><!--#include virtual="i-scream-autobuild.key" --></pre>
+          <p>
+            You can download a copy directly from
+            <a href="i-scream-autobuild.asc">here</a> or you can
+            search for it on a key server of your choice.
+          </p>
         </div>
 <!--#include virtual="/footer.inc" -->
       </div>