diff --git a/src/tools/cardos-info.c b/src/tools/cardos-info.c
index 92a43c62..05b7d7f6 100644
--- a/src/tools/cardos-info.c
+++ b/src/tools/cardos-info.c
@@ -336,7 +336,7 @@ int main(int argc, char *const argv[])
 	const char *opt_driver = NULL;
 
 	while (1) {
-		c = getopt_long(argc, argv, "r:qdc:w", options,
+		c = getopt_long(argc, argv, "r:vc:w", options,
 				&long_optind);
 		if (c == -1)
 			break;
diff --git a/src/tools/cryptoflex-tool.c b/src/tools/cryptoflex-tool.c
index 7fc3d324..8f36174d 100644
--- a/src/tools/cryptoflex-tool.c
+++ b/src/tools/cryptoflex-tool.c
@@ -1072,7 +1072,7 @@ int main(int argc, char * const argv[])
 	int do_create_pin_file = 0;
 
 	while (1) {
-		c = getopt_long(argc, argv, "P:vslgc:Rk:r:p:u:e:m:dqa:", options, &long_optind);
+		c = getopt_long(argc, argv, "P:Vslgc:Rk:r:p:u:e:m:va:", options, &long_optind);
 		if (c == -1)
 			break;
 		if (c == '?')
diff --git a/src/tools/opensc-explorer.c b/src/tools/opensc-explorer.c
index d45a549e..eda28f16 100644
--- a/src/tools/opensc-explorer.c
+++ b/src/tools/opensc-explorer.c
@@ -1344,7 +1344,7 @@ int main(int argc, char * const argv[])
 	printf("OpenSC Explorer version %s\n", sc_get_version());
 
 	while (1) {
-		c = getopt_long(argc, argv, "r:c:dw", options, &long_optind);
+		c = getopt_long(argc, argv, "r:c:vw", options, &long_optind);
 		if (c == -1)
 			break;
 		if (c == '?')
diff --git a/src/tools/opensc-tool.c b/src/tools/opensc-tool.c
index 2cd15f25..89b0cb95 100644
--- a/src/tools/opensc-tool.c
+++ b/src/tools/opensc-tool.c
@@ -364,7 +364,7 @@ int main(int argc, char * const argv[])
 	setbuf(stdout, NULL);
 
 	while (1) {
-		c = getopt_long(argc, argv, "nlfr:qds:DRc:aw", options, &long_optind);
+		c = getopt_long(argc, argv, "nlfr:vs:DRc:aw", options, &long_optind);
 		if (c == -1)
 			break;
 		if (c == '?')
diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c
index 3c4fb3de..c24e4efa 100644
--- a/src/tools/pkcs11-tool.c
+++ b/src/tools/pkcs11-tool.c
@@ -203,7 +203,7 @@ main(int argc, char * const argv[])
 	CK_RV rv;
 
 	while (1) {
-               c = getopt_long(argc, argv, "ILMOa:d:e:hi:klm:o:p:scqty:w:z:",
+               c = getopt_long(argc, argv, "ILMOa:d:e:hi:klm:o:p:scvty:w:z:",
 					options, &long_optind);
 		if (c == -1)
 			break;
diff --git a/src/tools/pkcs15-crypt.c b/src/tools/pkcs15-crypt.c
index b9262c1e..6fd01544 100644
--- a/src/tools/pkcs15-crypt.c
+++ b/src/tools/pkcs15-crypt.c
@@ -459,7 +459,7 @@ int main(int argc, char * const argv[])
         struct sc_pkcs15_object *key;
 		
 	while (1) {
-		c = getopt_long(argc, argv, "sck:r:i:o:qp:dw", options, &long_optind);
+		c = getopt_long(argc, argv, "sck:r:i:o:p:vw", options, &long_optind);
 		if (c == -1)
 			break;
 		if (c == '?')
diff --git a/src/tools/pkcs15-tool.c b/src/tools/pkcs15-tool.c
index 5d1c253e..dac700f6 100644
--- a/src/tools/pkcs15-tool.c
+++ b/src/tools/pkcs15-tool.c
@@ -856,7 +856,7 @@ int main(int argc, char * const argv[])
 	int action_count = 0;
 
 	while (1) {
-		c = getopt_long(argc, argv, "r:cuko:qda:LR:Cw", options, &long_optind);
+		c = getopt_long(argc, argv, "r:cuko:va:LR:Cw", options, &long_optind);
 		if (c == -1)
 			break;
 		if (c == '?')