diff --git a/mozilla/security/nss/lib/softoken/pcertdb.c b/mozilla/security/nss/lib/softoken/pcertdb.c
index be30e7dccec..672c23f7ab5 100644
--- a/mozilla/security/nss/lib/softoken/pcertdb.c
+++ b/mozilla/security/nss/lib/softoken/pcertdb.c
@@ -34,7 +34,7 @@
 /*
  * Permanent Certificate database handling code 
  *
- * $Id: pcertdb.c,v 1.16 2002-04-08 23:37:48 relyea%netscape.com Exp $
+ * $Id: pcertdb.c,v 1.17 2002-04-26 01:09:21 relyea%netscape.com Exp $
  */
 #include "prtime.h"
 
@@ -3016,6 +3016,8 @@ nsslowcert_AddPermNickname(NSSLOWCERTCertDBHandle *dbhandle,
     if (entry == NULL) goto loser;
 
     if ( entry->nickname == NULL ) {
+        certDBEntryNickname *nicknameEntry = NULL;
+
 	/* no nickname for subject */
 	rv = AddNicknameToSubject(dbhandle, cert, nickname);
 	if ( rv != SECSuccess ) {
@@ -3025,6 +3027,15 @@ nsslowcert_AddPermNickname(NSSLOWCERTCertDBHandle *dbhandle,
 	if ( rv != SECSuccess ) {
 	    goto loser;
 	}
+	nicknameEntry = NewDBNicknameEntry(nickname, &cert->derSubject, 0);
+	if ( nicknameEntry == NULL ) {
+	    goto loser;
+	}
+    
+	rv = WriteDBNicknameEntry(dbhandle, nicknameEntry);
+	if ( rv != SECSuccess ) {
+	    goto loser;
+	}
     } else {
 	/* subject already has a nickname */
 	rv = AddNicknameToPermCert(dbhandle, cert, entry->nickname);