diff --git a/mozilla/netwerk/base/public/security-prefs.js b/mozilla/netwerk/base/public/security-prefs.js
index ce75a5ff8a0..dea883a64cf 100644
--- a/mozilla/netwerk/base/public/security-prefs.js
+++ b/mozilla/netwerk/base/public/security-prefs.js
@@ -20,16 +20,8 @@ pref("security.ssl3.rsa_1024_rc4_56_sha", true);
 pref("security.ssl3.rsa_1024_des_cbc_sha", true);
 pref("security.ssl3.rsa_rc4_40_md5", true);
 pref("security.ssl3.rsa_rc2_40_md5", true);
-pref("security.ssl3.dhe_rsa_aes_256_sha", true);
-pref("security.ssl3.dhe_dss_aes_256_sha", true);
 pref("security.ssl3.rsa_aes_256_sha", true);
-pref("security.ssl3.dhe_rsa_aes_128_sha", true);
-pref("security.ssl3.dhe_dss_aes_128_sha", true);
 pref("security.ssl3.rsa_aes_128_sha", true);
-pref("security.ssl3.dhe_rsa_des_ede3_sha", true);
-pref("security.ssl3.dhe_dss_des_ede3_sha", true);
-pref("security.ssl3.dhe_rsa_des_sha", true);
-pref("security.ssl3.dhe_dss_des_sha", true);
 pref("security.ssl3.rsa_null_sha", false);
 pref("security.ssl3.rsa_null_md5", false);
 
diff --git a/mozilla/security/manager/pki/resources/content/ssl3tlsciphers2.xul b/mozilla/security/manager/pki/resources/content/ssl3tlsciphers2.xul
index a74d849c550..d576f47dd49 100644
--- a/mozilla/security/manager/pki/resources/content/ssl3tlsciphers2.xul
+++ b/mozilla/security/manager/pki/resources/content/ssl3tlsciphers2.xul
@@ -55,66 +55,18 @@
           <column/>
         </columns>
         <rows>
-          <row>
-            <checkbox label="&cipher.ssl3.dhe_rsa_aes_256_sha;"
-                      prefstring="security.ssl3.dhe_rsa_aes_256_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.dhe_rsa_aes_256_sha');"/>
-          </row>
-          <row>
-            <checkbox label="&cipher.ssl3.dhe_dss_aes_256_sha;"
-                      prefstring="security.ssl3.dhe_dss_aes_256_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.dhe_dss_aes_256_sha');"/>
-          </row>
           <row>
             <checkbox label="&cipher.ssl3.rsa_aes_256_sha;"
                       prefstring="security.ssl3.rsa_aes_256_sha"/>
             <button label="&cipher.details;"
                     oncommand="showInfo('security.ssl3.rsa_aes_256_sha');"/>
           </row>
-          <row>
-            <checkbox label="&cipher.ssl3.dhe_rsa_aes_128_sha;"
-                      prefstring="security.ssl3.dhe_rsa_aes_128_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.dhe_rsa_aes_128_sha');"/>
-          </row>
-          <row>
-            <checkbox label="&cipher.ssl3.dhe_dss_aes_128_sha;"
-                      prefstring="security.ssl3.dhe_dss_aes_128_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.dhe_dss_aes_128_sha');"/>
-          </row>
           <row>
             <checkbox label="&cipher.ssl3.rsa_aes_128_sha;"
                       prefstring="security.ssl3.rsa_aes_128_sha"/>
             <button label="&cipher.details;"
                     oncommand="showInfo('security.ssl3.rsa_aes_128_sha');"/>
           </row>
-          <row>
-            <checkbox label="&cipher.ssl3.dhe_rsa_des_ede3_sha;"
-                      prefstring="security.ssl3.dhe_rsa_des_ede3_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.dhe_rsa_des_ede3_sha');"/>
-          </row>
-          <row>
-            <checkbox label="&cipher.ssl3.dhe_dss_des_ede3_sha;"
-                      prefstring="security.ssl3.dhe_dss_des_ede3_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.dhe_dss_des_ede3_sha');"/>
-          </row>
-          <row>
-            <checkbox label="&cipher.ssl3.dhe_rsa_des_sha;"
-                      prefstring="security.ssl3.dhe_rsa_des_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.dhe_rsa_des_sha');"/>
-          </row>
-          <row>
-            <checkbox label="&cipher.ssl3.dhe_dss_des_sha;"
-                      prefstring="security.ssl3.dhe_dss_des_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.dhe_dss_des_sha');"/>
-          </row>
           <row>
             <checkbox label="&cipher.ssl3.rsa_null_sha;"
                       prefstring="security.ssl3.rsa_null_sha"/>
diff --git a/mozilla/security/manager/pki/resources/locale/en-US/pref-ssl.dtd b/mozilla/security/manager/pki/resources/locale/en-US/pref-ssl.dtd
index ae5045695f4..1dcdc4675d1 100644
--- a/mozilla/security/manager/pki/resources/locale/en-US/pref-ssl.dtd
+++ b/mozilla/security/manager/pki/resources/locale/en-US/pref-ssl.dtd
@@ -76,16 +76,8 @@
 <!ENTITY cipher.ssl3.rsa_rc2_40_md5 "40-bit RC2 encryption with RSA and an MD5 MAC (export)">
 
 <!-- Extra SSL3/TLS ciphers -->
-<!ENTITY cipher.ssl3.dhe_rsa_aes_256_sha "256-bit AES encryption with RSA, DHE, and a SHA1 MAC">
-<!ENTITY cipher.ssl3.dhe_dss_aes_256_sha "256-bit AES encryption with DSA, DHE, and a SHA1 MAC">
 <!ENTITY cipher.ssl3.rsa_aes_256_sha "256-bit AES encryption with RSA and a SHA1 MAC">
-<!ENTITY cipher.ssl3.dhe_rsa_aes_128_sha "128-bit AES encryption with RSA, DHE, and a SHA1 MAC">
-<!ENTITY cipher.ssl3.dhe_dss_aes_128_sha "128-bit AES encryption with DSA, DHE, and a SHA1 MAC">
 <!ENTITY cipher.ssl3.rsa_aes_128_sha "128-bit AES encryption with RSA and a SHA1 MAC">
-<!ENTITY cipher.ssl3.dhe_rsa_des_ede3_sha "168-bit Triple DES with RSA, DHE, and a SHA1 MAC">
-<!ENTITY cipher.ssl3.dhe_dss_des_ede3_sha "168-bit Triple DES with DSA, DHE, and a SHA1 MAC">
-<!ENTITY cipher.ssl3.dhe_rsa_des_sha "56-bit DES encryption with RSA, DHE, and a SHA1 MAC">
-<!ENTITY cipher.ssl3.dhe_dss_des_sha "56-bit DES encryption with DSA, DHE, and a SHA1 MAC">
 <!ENTITY cipher.ssl3.rsa_null_sha "No encryption with RSA authentication and a SHA1 MAC">
 <!ENTITY cipher.ssl3.rsa_null_md5 "No encryption with RSA authentication and an MD5 MAC">
 
diff --git a/mozilla/security/manager/ssl/src/nsNSSComponent.cpp b/mozilla/security/manager/ssl/src/nsNSSComponent.cpp
index 2d3acbcc882..818ee1a8865 100644
--- a/mozilla/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/mozilla/security/manager/ssl/src/nsNSSComponent.cpp
@@ -576,18 +576,8 @@ static CipherPref CipherPrefs[] = {
  {"security.ssl3.rsa_rc4_40_md5", SSL_RSA_EXPORT_WITH_RC4_40_MD5}, // 40-bit RC4 encryption with RSA and an MD5 MAC (export)
  {"security.ssl3.rsa_rc2_40_md5", SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5}, // 40-bit RC2 encryption with RSA and an MD5 MAC (export)
  /* Extra SSL3/TLS cipher suites */
- {"security.ssl3.dhe_rsa_aes_256_sha", TLS_DHE_RSA_WITH_AES_256_CBC_SHA}, // 256-bit AES encryption with RSA, DHE, and a SHA1 MAC
- {"security.ssl3.dhe_dss_aes_256_sha", TLS_DHE_DSS_WITH_AES_256_CBC_SHA}, // 256-bit AES encryption with DSA, DHE, and a SHA1 MAC
  {"security.ssl3.rsa_aes_256_sha", TLS_RSA_WITH_AES_256_CBC_SHA}, // 256-bit AES encryption with RSA and a SHA1 MAC
-   /* TLS_DHE_DSS_WITH_RC4_128_SHA // 128-bit RC4 encryption with DSA, DHE, and a SHA1 MAC
-      If this cipher gets included at a later time, it should get added at this position */
- {"security.ssl3.dhe_rsa_aes_128_sha", TLS_DHE_RSA_WITH_AES_128_CBC_SHA}, // 128-bit AES encryption with RSA, DHE, and a SHA1 MAC
- {"security.ssl3.dhe_dss_aes_128_sha", TLS_DHE_DSS_WITH_AES_128_CBC_SHA}, // 128-bit AES encryption with DSA, DHE, and a SHA1 MAC
  {"security.ssl3.rsa_aes_128_sha", TLS_RSA_WITH_AES_128_CBC_SHA}, // 128-bit AES encryption with RSA and a SHA1 MAC
- {"security.ssl3.dhe_rsa_des_ede3_sha", SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with RSA, DHE, and a SHA1 MAC
- {"security.ssl3.dhe_dss_des_ede3_sha", SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with DSA, DHE, and a SHA1 MAC
- {"security.ssl3.dhe_rsa_des_sha", SSL_DHE_RSA_WITH_DES_CBC_SHA}, // 56-bit DES encryption with RSA, DHE, and a SHA1 MAC
- {"security.ssl3.dhe_dss_des_sha", SSL_DHE_DSS_WITH_DES_CBC_SHA}, // 56-bit DES encryption with DSA, DHE, and a SHA1 MAC
  {"security.ssl3.rsa_null_sha", SSL_RSA_WITH_NULL_SHA}, // No encryption with RSA authentication and a SHA1 MAC
  {"security.ssl3.rsa_null_md5", SSL_RSA_WITH_NULL_MD5}, // No encryption with RSA authentication and an MD5 MAC
  {NULL, 0} /* end marker */