Index: src/tools/pkcs11-tool.c
===================================================================
--- src/tools/pkcs11-tool.c	(revision 3651)
+++ src/tools/pkcs11-tool.c	(working copy)
@@ -1042,13 +1042,14 @@
 	CK_OBJECT_CLASS privkey_class = CKO_PRIVATE_KEY;
 	CK_ATTRIBUTE publicKeyTemplate[20] = {
 		{CKA_CLASS, &pubkey_class, sizeof(pubkey_class)},
+		{CKA_TOKEN, &_true, sizeof(_true)},
 		{CKA_ENCRYPT, &_true, sizeof(_true)},
 		{CKA_VERIFY, &_true, sizeof(_true)},
 		{CKA_WRAP, &_true, sizeof(_true)},
 		{CKA_MODULUS_BITS, &modulusBits, sizeof(modulusBits)},
 		{CKA_PUBLIC_EXPONENT, publicExponent, sizeof(publicExponent)}
 	};
-	int n_pubkey_attr = 6;
+	int n_pubkey_attr = 7;
 	CK_ATTRIBUTE privateKeyTemplate[20] = {
 		{CKA_CLASS, &privkey_class, sizeof(privkey_class)},
 		{CKA_TOKEN, &_true, sizeof(_true)},