--- pktool.1	Thu Aug 16 11:57:56 2007
+++ pktool.1.new	Thu Aug 16 11:57:56 2007
@@ -217,15 +217,16 @@
            pktool export [token=token[:manuf[:serial]]]
                         outfile=output-fn
 
            pktool export keystore=pkcs11
                         outfile=output-fn
-                        [label=cert-label]
+			[objtype=cert|key]
+                        [label=label]
                         [subject=subject-DN]
                         [issuer=issuer-DN]
                         [serial=hex-serial-number]
-                        [outformat=pem|der|pkcs12]
+                        [outformat=pem|der|pkcs12|raw]
                         [token=token[:manuf[:serial]]]
 
            pktool export keystore=nss
                         outfile=output-fn
                         [subject=subject-DN]
@@ -433,13 +434,16 @@
            pktool import [token=token>[:manuf>[:serial>]]]
                         infile=input-fn
 
            pktool import [keystore=pkcs11]
                         infile=input-fn
-                        label=cert-label
+                        label=object-label
+			[keytype=aes|arcfour|des|3des|generic]
+			[sensitive=y|n]
+			[extractable=y|n]
                         [token=token[:manuf[:serial]]]
-                        [objtype=cert]
+                        [objtype=cert|key]
 
            pktool import keystore=pkcs11
                         objtype=crl
                         infile=input-fn
                         outcrl=output-crl-fn