diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java
index 826afa751da..cac66eca8d8 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 
 public abstract class CommonCompilerArguments {
-    public static final String PLUGIN_OPTION_FORMAT = "<pluginId>:<optionName>=<value>";
+    public static final String PLUGIN_OPTION_FORMAT = "plugin:<pluginId>:<optionName>=<value>";
 
     @Argument(value = "nowarn", description = "Generate no warnings")
     public boolean suppressWarnings;
@@ -43,11 +43,11 @@ public abstract class CommonCompilerArguments {
     @Argument(value = "Xno-inline", description = "Disable method inlining")
     public boolean noInline;
 
-    @Argument(value = "Xplugin", description = "Load a plugin from the given classpath")
+    @Argument(value = "Xplugin", description = "Load plugins from the given classpath")
     @ValueDescription("<path>")
     public String[] pluginClasspaths;
 
-    @Argument(value = "P", description = "Pass an option to a plugin")
+    @Argument(value = "P", description = "\n                             Pass an option to a plugin")
     @ValueDescription(PLUGIN_OPTION_FORMAT)
     public String[] pluginOptions;
 
diff --git a/compiler/testData/cli/js/jsExtraHelp.out b/compiler/testData/cli/js/jsExtraHelp.out
index c7fae46ff3c..8906cbcd4e5 100644
--- a/compiler/testData/cli/js/jsExtraHelp.out
+++ b/compiler/testData/cli/js/jsExtraHelp.out
@@ -1,6 +1,7 @@
 Usage: kotlinc-js <options> <source files>
 where advanced options include:
   -Xno-inline                Disable method inlining
+  -Xplugin <path>            Load plugins from the given classpath
 
 Advanced options are non-standard and may be changed or removed without any notice.
 OK
\ No newline at end of file
diff --git a/compiler/testData/cli/js/jsHelp.out b/compiler/testData/cli/js/jsHelp.out
index c655e68cf30..ad309efdc9b 100644
--- a/compiler/testData/cli/js/jsHelp.out
+++ b/compiler/testData/cli/js/jsHelp.out
@@ -13,4 +13,6 @@ where possible options include:
   -version                   Display compiler version
   -help (-h)                 Print a synopsis of standard options
   -X                         Print a synopsis of advanced options
+  -P plugin:<pluginId>:<optionName>=<value>
+                             Pass an option to a plugin
 OK
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out
index 3900b605fe9..8b119e15aa9 100644
--- a/compiler/testData/cli/jvm/extraHelp.out
+++ b/compiler/testData/cli/jvm/extraHelp.out
@@ -4,6 +4,7 @@ where advanced options include:
   -Xno-param-assertions      Don't generate not-null assertions on parameters of methods accessible from Java
   -Xno-optimize              Disable optimizations
   -Xno-inline                Disable method inlining
+  -Xplugin <path>            Load plugins from the given classpath
 
 Advanced options are non-standard and may be changed or removed without any notice.
 OK
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/help.out b/compiler/testData/cli/jvm/help.out
index abb5afc4af9..9761134ea11 100644
--- a/compiler/testData/cli/jvm/help.out
+++ b/compiler/testData/cli/jvm/help.out
@@ -10,11 +10,11 @@ where possible options include:
   -module <path>             Path to the module file to compile
   -script                    Evaluate the script file
   -kotlin-home <path>        Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
-  -androidRes <path>         Android resources path
-  -androidManifest <path>    Android manifest file
   -nowarn                    Generate no warnings
   -verbose                   Enable verbose logging output
   -version                   Display compiler version
   -help (-h)                 Print a synopsis of standard options
   -X                         Print a synopsis of advanced options
+  -P plugin:<pluginId>:<optionName>=<value>
+                             Pass an option to a plugin
 OK
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/wrongArgument.out b/compiler/testData/cli/jvm/wrongArgument.out
index 99ba24b71a2..3ffa78c3259 100644
--- a/compiler/testData/cli/jvm/wrongArgument.out
+++ b/compiler/testData/cli/jvm/wrongArgument.out
@@ -11,11 +11,11 @@ where possible options include:
   -module <path>             Path to the module file to compile
   -script                    Evaluate the script file
   -kotlin-home <path>        Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
-  -androidRes <path>         Android resources path
-  -androidManifest <path>    Android manifest file
   -nowarn                    Generate no warnings
   -verbose                   Enable verbose logging output
   -version                   Display compiler version
   -help (-h)                 Print a synopsis of standard options
   -X                         Print a synopsis of advanced options
+  -P plugin:<pluginId>:<optionName>=<value>
+                             Pass an option to a plugin
 INTERNAL_ERROR
\ No newline at end of file