1 files changed, 11 insertions, 0 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java b/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java
index a6350e5d8..44ccf9511 100644
--- a/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java
@@ -50,6 +50,11 @@ public class MainCLI extends CLI {
         addModule(new UserCLI(this));
     }
 
+    public void printVersion() {
+        Package pkg = MainCLI.class.getPackage();
+        System.out.println("PKI Command-Line Interface "+pkg.getImplementationVersion());
+    }
+
     public void printHelp() {
 
         formatter.printHelp(name+" [OPTIONS..] <command> [ARGS..]", options);
@@ -118,6 +123,7 @@ public class MainCLI extends CLI {
 
         options.addOption("v", false, "Verbose");
         options.addOption(null, "help", false, "Help");
+        options.addOption(null, "version", false, "Version");
     }
 
     public void parseOptions(CommandLine cmd) throws URISyntaxException {
@@ -170,6 +176,11 @@ public class MainCLI extends CLI {
 
             String[] cmdArgs = cmd.getArgs();
 
+            if (cmd.hasOption("version")) {
+                printVersion();
+                System.exit(1);
+            }
+
             if (cmdArgs.length == 0 || cmd.hasOption("help")) {
                 printHelp();
                 System.exit(1);