diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/DefaultValues.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/DefaultValues.kt
index 3f6f073269a..18eb1cca519 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/DefaultValues.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/DefaultValues.kt
@@ -30,7 +30,7 @@ open class DefaultValues(val defaultValue: String, val possibleValues: List<Stri
 
     object LanguageVersions : DefaultValues(
             "\"" + LanguageVersion.LATEST_STABLE.versionString + "\"",
-            LanguageVersion.values().map { "\"${it.versionString}\"" }
+            LanguageVersion.values().map { "\"${it.description}\"" }
     )
 
     object JvmTargetVersions : DefaultValues(
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java
index c7fda069f28..7e1f3b955a0 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java
@@ -317,7 +317,7 @@ public abstract class CLICompiler<A extends CommonCompilerArguments> {
         List<String> versionStrings = ArraysKt.map(LanguageVersion.values(), new Function1<LanguageVersion, String>() {
             @Override
             public String invoke(LanguageVersion version) {
-                return version.getVersionString();
+                return version.getDescription();
             }
         });
         String message = "Unknown " + versionOf + " version: " + value + "\n" +
diff --git a/compiler/testData/cli/jvm/apiVersionInvalid.out b/compiler/testData/cli/jvm/apiVersionInvalid.out
index 2589d801af6..7ecd1fba1bf 100644
--- a/compiler/testData/cli/jvm/apiVersionInvalid.out
+++ b/compiler/testData/cli/jvm/apiVersionInvalid.out
@@ -1,3 +1,3 @@
 error: unknown API version: 239.42
-Supported API versions: 1.0, 1.1, 1.2
+Supported API versions: 1.0, 1.1, 1.2 (EXPERIMENTAL)
 COMPILATION_ERROR
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/languageVersionInvalid.out b/compiler/testData/cli/jvm/languageVersionInvalid.out
index 2f527e6532e..a38f415a952 100644
--- a/compiler/testData/cli/jvm/languageVersionInvalid.out
+++ b/compiler/testData/cli/jvm/languageVersionInvalid.out
@@ -1,3 +1,3 @@
 error: unknown language version: 239.42
-Supported language versions: 1.0, 1.1, 1.2
+Supported language versions: 1.0, 1.1, 1.2 (EXPERIMENTAL)
 COMPILATION_ERROR
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
index 34e905c2954..f97089ebebb 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
@@ -6,14 +6,14 @@ interface KotlinCommonOptions {
 
     /**
      * Allow to use declarations only from the specified version of bundled libraries
-     * Possible values: "1.0", "1.1", "1.2"
+     * Possible values: "1.0", "1.1", "1.2 (EXPERIMENTAL)"
      * Default value: "1.1"
      */
      var apiVersion: kotlin.String
 
     /**
      * Provide source compatibility with specified language version
-     * Possible values: "1.0", "1.1", "1.2"
+     * Possible values: "1.0", "1.1", "1.2 (EXPERIMENTAL)"
      * Default value: "1.1"
      */
      var languageVersion: kotlin.String
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt
index e752eb9daa3..ea37c61f134 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt
@@ -54,4 +54,4 @@ interface KotlinJsOptions  : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
      * Default value: false
      */
      var typedArrays: kotlin.Boolean
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt
index 68c9fd7dcb5..61afda93b4a 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt
@@ -93,4 +93,4 @@ internal fun org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments.fil
     sourceMap = false
     target = "v5"
     typedArrays = false
-}
\ No newline at end of file
+}