diff --git a/mozilla/security/manager/pki/resources/content/PrefOverlay.xul b/mozilla/security/manager/pki/resources/content/PrefOverlay.xul
new file mode 100644
index 00000000000..e5ee80e0e77
--- /dev/null
+++ b/mozilla/security/manager/pki/resources/content/PrefOverlay.xul
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Terry Hayes <thayes@netscape.com>
+  -->
+
+<!-- This file extends "chrome://communicator/content/pref/preftree.xul" -->
+
+<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/PrefOverlay.dtd">
+
+<overlay id="pipPrefOverlayID"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  
+  <treechildren id="panelChildren">
+    <treeitem id="securityItem" open="true" position="3" container="true" >
+      <treerow>
+        <treecell class="treecell-indent" url="chrome://pippki/content/SecurityPrefs.xul"
+           value="&security.label;" />
+      </treerow>
+      <!-- Subitems go here -->
+      <treechildren id="securityChildren">
+        <treeitem id="sslItem" open="true" >
+          <treerow>
+             <treecell class="treecell-indent" url="chrome://pippki/content/SSLPrefs.xul"
+               value="&ssl.label;" />
+          </treerow>
+        </treeitem>
+      </treechildren>
+    </treeitem>
+  </treechildren>
+</overlay>
diff --git a/mozilla/security/manager/pki/resources/content/SSLPrefs.xul b/mozilla/security/manager/pki/resources/content/SSLPrefs.xul
new file mode 100644
index 00000000000..6cfaf3c2187
--- /dev/null
+++ b/mozilla/security/manager/pki/resources/content/SSLPrefs.xul
@@ -0,0 +1,116 @@
+<?xml version="1.0"?> 
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Terry Hayes <thayes@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/SSLPrefs.dtd">
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        class="color-dialog"
+        orient="vertical" title="Security Preferences"
+        onload="parent.initPanel('chrome://pippki/content/SSLPrefs.xul');" >
+
+  <!-- List elements to manage for prefs -->
+  <script language="JavaScript">
+  <![CDATA[
+    _elementIDs = ["enableSSL2", "enableSSL3", "enableTLS", 
+        "warnEnteringSecure", "warnInsecurePost", "warnInsecurePostFromSecure",
+        "warnSecureRedirect", "warnSecureRedirectToInsecure",
+        "warnViewMixed", "certSelection" ];
+  ]]>
+  </script>
+            
+  <!-- Fancy panel header -->
+  <box class="box-smallheader" title="SSL" description="Settings for SSL"/>
+
+  <titledbox orient="horizontal">
+    <title><text value="&SSLProtocolVersions;"/></title>
+
+    <!-- Prefs -->
+<box orient="vertical" flex="1">
+    <checkbox id="enableSSL2" value="Enable SSL version 2"
+              pref="true" preftype="bool" prefstring="security.enable_ssl2"
+              prefattribute="checked"/>
+    <checkbox id="enableSSL3" value="Enable SSL version 3"
+              pref="true" preftype="bool" prefstring="security.enable_ssl3"
+              prefattribute="checked"/>
+    <checkbox id="enableTLS" value="Enable TLS"
+              pref="true" preftype="bool" prefstring="security.enable_tls"
+              prefattribute="checked"/>
+</box>
+
+    <box orient="vertical" halign="right">
+      <button class="dialog" value="Edit SSL Ciphers..." disabled="true"
+        oncommand="window.openDialog('chrome://pippki/content/cipherViewer.xul', '',
+                       'modal=yes,resizable,chrome');" />
+    </box>
+
+  </titledbox>
+
+  <titledbox orient="vertical">
+    <title><text value="&SSLWarnings;"/></title>
+    <html>
+Netscape can alert you to the security status of the web page you are viewing.
+Set Netscape to show a warning and ask permission before:
+    </html>
+
+    <!-- Prefs -->
+    <checkbox id="warnEnteringSecure" 
+		  value="Entering a site that supports encryption"
+              pref="true" preftype="bool" prefstring="security.warn_entering_secure"
+              prefattribute="checked"/>
+    <checkbox id="warnInsecurePost"
+		  value="Sending form data from an insecure page to an insecure page"
+              pref="true" preftype="bool" prefstring="security.warn_submit_insecure"
+              prefattribute="checked"/>
+    <checkbox id="warnInsecurePostFromSecure"
+		  value="Sending form data from a secure page to an insecure page"
+              pref="true" preftype="bool" prefstring="pip.security.warn_insecure_post_from_secure"
+              prefattribute="checked" checked="true"  disabled="true"/>
+    <checkbox id="warnSecureRedirect" value="Redirection from one secure site to another"
+              pref="true" preftype="bool" prefstring="pip.security.warn_secure_redirect"
+              prefattribute="checked"/>
+    <checkbox id="warnSecureRedirectToInsecure" 
+              value="Redirection from a secure site to an insecure site"
+              pref="true" preftype="bool" prefstring="pip.security.warn_secure_redirect_to_insecure"
+              prefattribute="checked"/>
+    <checkbox id="warnViewMixed" value="Viewing a page with an encrypted/unencrypted mix"
+              pref="true" preftype="bool" prefstring="security.warn_viewing_mixed"
+              prefattribute="checked" checked="true"/>
+  </titledbox>
+
+  <titledbox orient="vertical">
+    <title><text value="&SSLClientAuthMethod;"/></title>
+    <html>Decide how Netscape selects a security certificate to 
+	present to web sites that require one:</html>
+    <!-- Prefs -->
+    <radiogroup id="certSelection" pref="true" preftype="int" 
+	prefstring="pip.security.default_personal_cert" prefattribute="data">
+    <radio group="certSelection" value="Select Automatically" data="0"/>
+    <radio group="certSelection" value="Select Manually" data="1"/>
+    </radiogroup>
+  </titledbox>
+
+</window>
diff --git a/mozilla/security/manager/pki/resources/content/SecurityPrefs.xul b/mozilla/security/manager/pki/resources/content/SecurityPrefs.xul
new file mode 100644
index 00000000000..8c087c17142
--- /dev/null
+++ b/mozilla/security/manager/pki/resources/content/SecurityPrefs.xul
@@ -0,0 +1,60 @@
+<?xml version="1.0"?> 
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pip/locale/SecurityPrefs.dtd">
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        class="color-dialog"
+        orient="vertical" title="Security Preferences"
+        onload="parent.initPanel('chrome://pip/content/SecurityPrefs.xul');" >
+
+  <!-- List elements to manage for prefs?? -->
+  <script language="JavaScript">
+  <![CDATA[
+    _elementIDs = [];
+  ]]>
+  </script>
+            
+  <!-- Fancy panel header -->
+  <box class="box-smallheader" title="Privacy/Security" 
+     description="Settings for Privacy/Security"/>
+
+  <titledbox orient="vertical">
+    <title><text value="Reset Settings"/></title>
+<html>
+Use this button to reset Netscape's security preferences to their factory settings.
+</html>
+    <!-- Prefs -->
+    <box halign="left" autostretch="never">
+      <button class="dialog" value="Reset Preferences..." disabled="true"
+        oncommand="alert('You FOOL! You'll get us ALL killed!');" />
+</box>
+  </titledbox>
+
+  <titledbox orient="vertical">
+    <title><text value="Manage Certificates"/></title>
+<html>
+Use the Certificate Manager to manage your personal certificates, as well as those of other people and certificate authorities.
+</html>
+    <box halign="left" autostretch="never">
+      <button class="dialog" value="Manage Certificates..." disabled="true"
+        oncommand="window.openDialog('chrome://pip/content/cert_manager.xul', '',
+                       'modal=yes,resizable,chrome');" />
+    </box>
+  </titledbox>
+
+  <titledbox orient="vertical">
+    <title><text value="Manage Security Devices"/></title>
+<html>
+Use this button to manage your security devices, such as smart cards.
+</html>
+    <box halign="left" autostretch="never">
+      <button class="dialog" value="Manage Security Devices..." disabled="true"
+        oncommand="window.openDialog('chrome://pip/content/device_manager.xul', '',
+                       'modal=yes,resizable,chrome');" />
+    </box>
+  </titledbox>
+
+
+</window>
diff --git a/mozilla/security/manager/pki/resources/content/contents.rdf b/mozilla/security/manager/pki/resources/content/contents.rdf
index 8b09dfdb72c..5a907f31a76 100644
--- a/mozilla/security/manager/pki/resources/content/contents.rdf
+++ b/mozilla/security/manager/pki/resources/content/contents.rdf
@@ -1,4 +1,26 @@
 <?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Terry Hayes <thayes@netscape.com>
+  -->
+
 <RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
 
@@ -13,5 +35,16 @@
         chrome:author="PSM Team"
         chrome:name="pippki">
   </RDF:Description>
+
+  <!-- Declare overlay points used in this package -->
+  <RDF:Seq about="urn:mozilla:overlays">
+    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
+  </RDF:Seq>
+
+  <!-- Define the local overlay file(s) for each overlay point -->
+  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
+    <RDF:li>chrome://pippki/content/PrefOverlay.xul</RDF:li>
+  </RDF:Seq>
+
 </RDF:RDF>  
 
diff --git a/mozilla/security/manager/pki/resources/jar.mn b/mozilla/security/manager/pki/resources/jar.mn
index fc988df9630..af208cc208d 100644
--- a/mozilla/security/manager/pki/resources/jar.mn
+++ b/mozilla/security/manager/pki/resources/jar.mn
@@ -2,6 +2,11 @@ pippki.jar:
     content/pippki/contents.rdf             (content/contents.rdf)
     content/pippki/changepassword.xul       (content/changepassword.xul)
     content/pippki/password.js              (content/password.js)
+    content/pippki/PrefOverlay.xul          (content/PrefOverlay.xul)
+    content/pippki/SecurityPrefs.xul         (content/SecurityPrefs.xul)
+    content/pippki/SSLPrefs.xul             (content/SSLPrefs.xul)
     locale/en-US/pippki/contents.rdf        (locale/en-US/contents.rdf)
     locale/en-US/pippki/pippki.dtd          (locale/en-US/pippki.dtd)
-
+    locale/en-US/pippki/SSLPrefs.dtd        (locale/en-US/SSLPrefs.dtd)
+    locale/en-US/pippki/pippki.properties  (locale/en-US/pippki.properties)
+    locale/en-US/pippki/PrefOverlay.dtd     (locale/en-US/PrefOverlay.dtd)
diff --git a/mozilla/security/manager/pki/resources/locale/en-US/PrefOverlay.dtd b/mozilla/security/manager/pki/resources/locale/en-US/PrefOverlay.dtd
new file mode 100644
index 00000000000..2343d0b4bf0
--- /dev/null
+++ b/mozilla/security/manager/pki/resources/locale/en-US/PrefOverlay.dtd
@@ -0,0 +1,25 @@
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Terry Hayes <thayes@netscape.com>
+  -->
+
+<!ENTITY  security.label               "Privacy/Security">
+<!ENTITY  ssl.label                    "SSL">
diff --git a/mozilla/security/manager/pki/resources/locale/en-US/SSLPrefs.dtd b/mozilla/security/manager/pki/resources/locale/en-US/SSLPrefs.dtd
new file mode 100644
index 00000000000..508c605d2f9
--- /dev/null
+++ b/mozilla/security/manager/pki/resources/locale/en-US/SSLPrefs.dtd
@@ -0,0 +1,26 @@
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Terry Hayes <thayes@netscape.com>
+  -->
+
+<!ENTITY  SSLProtocolVersions          "SSL Protocol Versions">
+<!ENTITY  SSLWarnings                  "SSL Warnings">
+<!ENTITY  SSLClientAuthMethod          "Client Certificate Selection">
\ No newline at end of file
diff --git a/mozilla/security/manager/pki/resources/locale/en-US/SecurityPrefs.dtd b/mozilla/security/manager/pki/resources/locale/en-US/SecurityPrefs.dtd
new file mode 100644
index 00000000000..2343d0b4bf0
--- /dev/null
+++ b/mozilla/security/manager/pki/resources/locale/en-US/SecurityPrefs.dtd
@@ -0,0 +1,25 @@
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Terry Hayes <thayes@netscape.com>
+  -->
+
+<!ENTITY  security.label               "Privacy/Security">
+<!ENTITY  ssl.label                    "SSL">
diff --git a/mozilla/security/manager/pki/resources/locale/en-US/contents.rdf b/mozilla/security/manager/pki/resources/locale/en-US/contents.rdf
index 09ac685b411..01636dd0976 100644
--- a/mozilla/security/manager/pki/resources/locale/en-US/contents.rdf
+++ b/mozilla/security/manager/pki/resources/locale/en-US/contents.rdf
@@ -1,4 +1,26 @@
 <?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Terry Hayes <thayes@netscape.com>
+  -->
+
 <RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
 
diff --git a/mozilla/security/manager/pki/resources/locale/en-US/pippki.dtd b/mozilla/security/manager/pki/resources/locale/en-US/pippki.dtd
index 439c981c03b..97314ba22a2 100644
--- a/mozilla/security/manager/pki/resources/locale/en-US/pippki.dtd
+++ b/mozilla/security/manager/pki/resources/locale/en-US/pippki.dtd
@@ -1,3 +1,25 @@
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Terry Hayes <thayes@netscape.com>
+  -->
+
 <!-- Values for changepassword.xul -->
 <!ENTITY setPassword.title  "Set Master Password">
 <!ENTITY setPassword.tokenName.label "Token Name">
@@ -17,3 +39,11 @@
 <!ENTITY setPassword.cancel.label "Cancel">
 <!ENTITY setPassword.help.label "Help">
 
+<!-- Prefs panel strings -->
+<!ENTITY pref.security.general.lHeader "Security">
+<!ENTITY pref.security.general.rHeader "Settings for general security">
+<!ENTITY pref.security.general.header "Settings for general security">
+<!ENTITY pref.security.general.level.title "Security Level">
+<!ENTITY pref.security.general.paranoid.label "Use paranoid security settings">
+<!ENTITY pref.security.general.certificates.title "Certificates">
+<!ENTITY pref.security.general.manageCert.label "Manage Certificates">
diff --git a/mozilla/security/manager/pki/resources/locale/en-US/pippki.properties b/mozilla/security/manager/pki/resources/locale/en-US/pippki.properties
new file mode 100644
index 00000000000..6ff5a4b611d
--- /dev/null
+++ b/mozilla/security/manager/pki/resources/locale/en-US/pippki.properties
@@ -0,0 +1,24 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+# 
+
+SignedBy=Signed by %S
+CertPassPrompt=Please enter the Personal Security Password for the PSM Private Keys security device.
+RootCertModuleName=Builtin Roots Module