2 files changed, 22 insertions, 0 deletions

diff --git a/tools/perf/Documentation/perf.txt b/tools/perf/Documentation/perf.txt
index 2b131776363e..864e37597252 100644
--- a/tools/perf/Documentation/perf.txt
+++ b/tools/perf/Documentation/perf.txt
@@ -27,6 +27,14 @@ OPTIONS
         Setup buildid cache directory. It has higher priority than
         buildid.dir config file option.
 
+-v::
+--version::
+  Display perf version.
+
+-h::
+--help::
+  Run perf help command.
+
 DESCRIPTION
 -----------
 Performance counters for Linux are a new kernel-based subsystem
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 1fded922bcc8..543713422d14 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -162,6 +162,20 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
                         break;
 
                 /*
+                 * Shortcut for '-h' and '-v' options to invoke help
+                 * and version command.
+                 */
+                if (!strcmp(cmd, "-h")) {
+                        (*argv)[0] = "--help";
+                        break;
+                }
+
+                if (!strcmp(cmd, "-v")) {
+                        (*argv)[0] = "--version";
+                        break;
+                }
+
+                /*
                  * Check remaining flags.
                  */
                 if (!prefixcmp(cmd, CMD_EXEC_PATH)) {