--- a/security/nss/cmd/signtool/certgen.c
+++ b/security/nss/cmd/signtool/certgen.c
@@ -468,17 +468,17 @@ sign_cert(CERTCertificate *cert, SECKEYP
 	errorCount++;
 	exit (ERRX);
     }
 
     der2.len = 0;
     der2.data = NULL;
 
     dummy = SEC_ASN1EncodeItem
-        (cert->arena, &der2, cert, CERT_CertificateTemplate);
+        (cert->arena, &der2, cert, SEC_ASN1_GET(CERT_CertificateTemplate));
 
     if (rv != SECSuccess) {
 	PR_fprintf(errorFD, "%s: error encoding cert\n", PROGRAM_NAME);
 	errorCount++;
 	exit (ERRX);
     }
 
     result2 = (SECItem * ) PORT_ArenaZAlloc (cert->arena, sizeof (SECItem));

--- a/security/nss/cmd/signtool/manifest.mn
+++ b/security/nss/cmd/signtool/manifest.mn
@@ -49,11 +49,9 @@ CSRCS = signtool.c		\
 		verify.c	\
 		zip.c		\
 	$(NULL)
 
 PROGRAM =  signtool
 
 REQUIRES = seccmd
 
-USE_STATIC_LIBS = 1
-
 EXTRA_LIBS = $(JAR_LIBS)