diff --git a/cmdline.ggo b/cmdline.ggo
index 79b9e7f..270688d 100644
--- a/cmdline.ggo
+++ b/cmdline.ggo
@@ -27,3 +27,4 @@
 option "verbose" v "Print more information" flag off
 option "reader" r "Only use a matching reader" string optional
 option "key" k "Authentication key to use" string optional default="010203040506070801020304050607080102030405060708"
+option "action" a "Action to take" values="version" enum
diff --git a/yubico-piv-tool.c b/yubico-piv-tool.c
index a383c00..4839c45 100644
--- a/yubico-piv-tool.c
+++ b/yubico-piv-tool.c
@@ -318,7 +318,9 @@ int main(int argc, char *argv[]) {
     return EXIT_FAILURE;
   }
 
-  print_version(&card, args_info.verbose_flag);
+  if(args_info.action_arg == action_arg_version) {
+    print_version(&card, args_info.verbose_flag);
+  }
 
   return EXIT_SUCCESS;
 }