--- a/src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java	Tue Dec 11 12:54:18 2018 -0500
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java	Wed Dec 12 08:27:16 2018 -0500
@@ -78,14 +78,17 @@
         if (args.length == 0) {
             CLIHelp.showHelp(true);
         } else if (hasHelp(args)){
+            if (hasVersion(args)) {
+                Log.info(version + "\n");
+            }
             CLIHelp.showHelp(false);
-        } else if (args.length == 1 && args[0].equals("--version")) {
+        } else if (hasVersion(args)) {
             Log.info(version);
         } else {
             try {
                 Arguments arguments = new Arguments(args);
-                if (!arguments.processArguments()) { // processArguments() should log error message
-                                                     // if failed.
+                if (!arguments.processArguments()) {
+                    // processArguments() should log error message if failed.
                     return -1;
                 }
             } catch (Exception e) {
@@ -113,4 +116,13 @@
         return false;
     }
 
+    private static boolean hasVersion(String[] args) {
+        for (String a : args) {
+            if ("--version".equals(a) || "-v".equals(a)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
 }