diff --git a/en/security/security.sgml b/en/security/security.sgml
index dee3553986..b42a4f4c95 100644
--- a/en/security/security.sgml
+++ b/en/security/security.sgml
@@ -1,13 +1,13 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.180 2005/10/17 21:26:56 simon Exp $">
+<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.181 2005/11/08 20:39:22 simon Exp $">
 <!ENTITY title "FreeBSD Security Information">
 <!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 <!ENTITY advisories.html.inc SYSTEM "advisories.html.inc">
 ]>
-<!-- $FreeBSD: www/en/security/security.sgml,v 1.180 2005/10/17 21:26:56 simon Exp $ -->
+<!-- $FreeBSD: www/en/security/security.sgml,v 1.181 2005/11/08 20:39:22 simon Exp $ -->
 
 <html>
   &header;
@@ -34,19 +34,23 @@
     <li><a href="charter.html">Charter for the Security Officer and Team</a></li>
     <li><a href="#pol">Information handling policies</a></li>
     <li><a href="#adv">FreeBSD Security Advisories</a></li>
-    <li><a href="http://www.freebsd.org/handbook/security-advisories.html">
+    <li><a href="&base;/doc/en_US.ISO8859-1/books/handbook/security-advisories.html">
         Reading FreeBSD Security Advisories</a></li>
   </ul>
 
   <a name="how"></a>
-  <p>All FreeBSD Security issues should be reported directly to the <a
-    href="mailto:security@FreeBSD.org">Security Officer Team</a>
-    personally or otherwise to the <a
-    href="mailto:security-officer@FreeBSD.org"> Security Officer</a>.
-    All reports should at least contain:<br><br> A description of the
-    vulnerability;<br> What versions of FreeBSD seem to be affected if
-    possible;<br> Any plausible workaround;<br> And example code if
-    possible.<br></p>
+  <p>All FreeBSD Security issues should be reported to the <a
+      href="mailto:secteam@FreeBSD.org">FreeBSD Security Team</a>
+    or, if a higher level of confidentiality is required, to the <a
+      href="mailto:security-officer@FreeBSD.org">Security Officer Team</a>.
+    All reports should at least contain:</p>
+
+  <ul>
+    <li>A description of the vulnerability.</li>
+    <li>What versions of FreeBSD seem to be affected if possible.</li>
+    <li>Any plausible workaround.</li>
+    <li>Example code if possible.</li>
+  </ul>
 
   <p>After this information has been reported the Security Officer or
     a Security Team delegate will get back with you.</p>
@@ -97,8 +101,10 @@
   </table>
 
   <p>The Security Officer is supported by the <a
-      href="mailto:security@FreeBSD.org">FreeBSD Security Team
-    &lt;security@FreeBSD.org&gt;</a>, a small group of committers
+      href="&base;/doc/en_US.ISO8859-1/articles/contributors/staff-listing.html#STAFF-SECTEAM"
+      >FreeBSD Security Team</a> <a
+      href="mailto:secteam@FreeBSD.org">&lt;secteam@FreeBSD.org&gt;</a>,
+    a small group of committers
     vetted by the Security Officer.</p>
 
   <p>Please use the <a