diff --git a/mozilla/security/nss/cmd/certutil/certutil.c b/mozilla/security/nss/cmd/certutil/certutil.c
index 143c1154e29..d2632e68f49 100644
--- a/mozilla/security/nss/cmd/certutil/certutil.c
+++ b/mozilla/security/nss/cmd/certutil/certutil.c
@@ -314,8 +314,7 @@ CertReq(SECKEYPrivateKey *privk, SECKEYPublicKey *pubk, KeyType keyType,
 
 	name = CERT_GetCommonName(subject);
 	if (!name) {
-	    fprintf(stderr, "You must specify a common name\n");
-	    return SECFailure;
+	    name = strdup("(not specified)");
 	}
 
 	if (!phone)
@@ -2135,6 +2134,7 @@ secuCommandFlag certutil_options[] =
 		rv = SECFailure;
 		goto shutdown;
 	    }
+	    keytype = privkey->keyType;
 	} else {
 	    privkey = 
 		CERTUTIL_GeneratePrivateKey(keytype, slot, keysize,