diff --git a/mozilla/security/nss/lib/ckfw/builtins/certdata.c b/mozilla/security/nss/lib/ckfw/builtins/certdata.c
index 82120585f19..36561569a3e 100644
--- a/mozilla/security/nss/lib/ckfw/builtins/certdata.c
+++ b/mozilla/security/nss/lib/ckfw/builtins/certdata.c
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.78 $ $Date: 2011-08-01 06:33:46 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.78 $ $Date: 2011-08-01 06:33:46 $";
+static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.79 $ $Date: 2011-08-30 20:01:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.79 $ $Date: 2011-08-30 20:01:39 $";
 #endif /* DEBUG */
 
 #ifndef BUILTINS_H
@@ -1053,7 +1053,7 @@ static const NSSItem nss_builtins_items_0 [] = {
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"CVS ID", (PRUint32)7 },
   { (void *)"NSS", (PRUint32)4 },
-  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.78 $ $Date: 2011-08-01 06:33:46 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.78 $ $Date: 2011-08-01 06:33:46 $", (PRUint32)160 }
+  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.79 $ $Date: 2011-08-30 20:01:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.79 $ $Date: 2011-08-30 20:01:39 $", (PRUint32)160 }
 };
 #endif /* DEBUG */
 static const NSSItem nss_builtins_items_1 [] = {
@@ -12506,7 +12506,7 @@ static const NSSItem nss_builtins_items_186 [] = {
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"DigiNotar Root CA", (PRUint32)18 },
+  { (void *)"Explicity Disable DigiNotar Root CA", (PRUint32)36 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
 "\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
@@ -12525,11 +12525,11 @@ static const NSSItem nss_builtins_items_186 [] = {
 "\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
 "\154"
 , (PRUint32)97 },
-  { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223"
-"\074\114"
+  { (void *)"\002\020\017\377\377\377\377\377\377\377\377\377\377\377\377\377"
+"\377\377"
 , (PRUint32)18 },
-  { (void *)"\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014"
-"\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060"
+  { (void *)"\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\017"
+"\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\060"
 "\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137"
 "\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060"
 "\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141"
@@ -12537,8 +12537,8 @@ static const NSSItem nss_builtins_items_186 [] = {
 "\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060"
 "\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156"
 "\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060"
-"\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132"
-"\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060"
+"\036\027\015\060\067\060\065\061\066\061\067\061\071\063\067\132"
+"\027\015\062\065\060\063\063\061\061\070\061\071\062\062\132\060"
 "\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022"
 "\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164"
 "\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147"
@@ -12624,11 +12624,11 @@ static const NSSItem nss_builtins_items_187 [] = {
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"DigiNotar Root CA", (PRUint32)18 },
-  { (void *)"\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317"
-"\201\147\107\214"
+  { (void *)"Explicity Disable DigiNotar Root CA", (PRUint32)36 },
+  { (void *)"\120\304\137\156\137\265\055\345\236\154\263\001\335\270\213\310"
+"\273\171\202\324"
 , (PRUint32)20 },
-  { (void *)"\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230"
+  { (void *)"\367\266\251\066\313\163\012\164\317\376\346\077\213\101\101\036"
 , (PRUint32)16 },
   { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
 "\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
@@ -12638,12 +12638,12 @@ static const NSSItem nss_builtins_items_187 [] = {
 "\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
 "\154"
 , (PRUint32)97 },
-  { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223"
-"\074\114"
+  { (void *)"\002\020\017\377\377\377\377\377\377\377\377\377\377\377\377\377"
+"\377\377"
 , (PRUint32)18 },
-  { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
 static const NSSItem nss_builtins_items_188 [] = {
diff --git a/mozilla/security/nss/lib/ckfw/builtins/certdata.txt b/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
index 71c684e208c..81d66901f76 100644
--- a/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
+++ b/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
@@ -34,7 +34,7 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
-CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.75 $ $Date: 2011-08-01 06:33:47 $"
+CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.76 $ $Date: 2011-08-30 20:01:39 $"
 
 #
 # certdata.txt
@@ -12461,13 +12461,13 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "DigiNotar Root CA"
+# Certificate "Explicity Disable DigiNotar Root CA"
 #
 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "DigiNotar Root CA"
+CKA_LABEL UTF8 "Explicity Disable DigiNotar Root CA"
 CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
 CKA_SUBJECT MULTILINE_OCTAL
 \060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
@@ -12489,12 +12489,12 @@ CKA_ISSUER MULTILINE_OCTAL
 \154
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223
-\074\114
+\002\020\017\377\377\377\377\377\377\377\377\377\377\377\377\377
+\377\377
 END
 CKA_VALUE MULTILINE_OCTAL
-\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014
-\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060
+\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\017
+\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\060
 \015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137
 \061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060
 \020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141
@@ -12502,8 +12502,8 @@ CKA_VALUE MULTILINE_OCTAL
 \116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060
 \036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156
 \146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060
-\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132
-\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060
+\036\027\015\060\067\060\065\061\066\061\067\061\071\063\067\132
+\027\015\062\065\060\063\063\061\061\070\061\071\062\062\132\060
 \137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022
 \060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164
 \141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147
@@ -12584,18 +12584,18 @@ CKA_VALUE MULTILINE_OCTAL
 \262\345\214\360\206\231\270\345\305\337\204\301\267\353
 END
 
-# Trust for Certificate "DigiNotar Root CA"
+# Trust for Certificate "Explicity Disable DigiNotar Root CA"
 CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "DigiNotar Root CA"
+CKA_LABEL UTF8 "Explicity Disable DigiNotar Root CA"
 CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317
-\201\147\107\214
+\120\304\137\156\137\265\055\345\236\154\263\001\335\270\213\310
+\273\171\202\324
 END
 CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230
+\367\266\251\066\313\163\012\164\317\376\346\077\213\101\101\036
 END
 CKA_ISSUER MULTILINE_OCTAL
 \060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
@@ -12607,12 +12607,12 @@ CKA_ISSUER MULTILINE_OCTAL
 \154
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223
-\074\114
+\002\020\017\377\377\377\377\377\377\377\377\377\377\377\377\377
+\377\377
 END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_NOT_TRUSTED
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
diff --git a/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h b/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h
index bc50dcf883c..177334698a3 100644
--- a/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h
+++ b/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h
@@ -77,8 +77,8 @@
  * of the comment in the CK_VERSION type definition.
  */
 #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 84
-#define NSS_BUILTINS_LIBRARY_VERSION "1.84"
+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 85
+#define NSS_BUILTINS_LIBRARY_VERSION "1.85"
 
 /* These version numbers detail the semantic changes to the ckfw engine. */
 #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1