diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
index bb19d844885..7bef980a25d 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
@@ -817,7 +817,8 @@ Also sets `-jvm-target` value equal to the selected JDK version"""
 
     @Argument(
         value = "-Xuse-old-innerclasses-logic",
-        description = "Use old logic for generation of InnerClasses attributes"
+        description = "Use old logic for generation of InnerClasses attributes.\n" +
+                "This option is deprecated and will be deleted in future versions."
     )
     var oldInnerClassesLogic = false
         set(value) {
@@ -910,6 +911,12 @@ Also sets `-jvm-target` value equal to the selected JDK version"""
                         "Please use language version 1.5 or below, or remove -Xuse-old-backend"
             )
         }
+        if (oldInnerClassesLogic) {
+            collector.report(
+                CompilerMessageSeverity.WARNING,
+                "The -Xuse-old-innerclasses-logic option is deprecated and will be deleted in future versions."
+            )
+        }
     }
 
     override fun copyOf(): Freezable = copyK2JVMCompilerArguments(this, K2JVMCompilerArguments())
diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out
index 29999ef4426..29559c6d126 100644
--- a/compiler/testData/cli/jvm/extraHelp.out
+++ b/compiler/testData/cli/jvm/extraHelp.out
@@ -103,7 +103,8 @@ where advanced options include:
                                * ignore
                                * strict
                                * warn (report a warning)
-  -Xuse-old-innerclasses-logic Use old logic for generation of InnerClasses attributes
+  -Xuse-old-innerclasses-logic Use old logic for generation of InnerClasses attributes.
+                             This option is deprecated and will be deleted in future versions.
   -Xprofile=<profilerPath:command:outputDir>
                              Debug option: Run compiler with async profiler and save snapshots to `outputDir`; `command` is passed to async-profiler on start.
                              `profilerPath` is a path to libasyncProfiler.so; async-profiler.jar should be on the compiler classpath.
diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle
index 68591566d62..6697b27c1cd 100644
--- a/libraries/stdlib/jvm/build.gradle
+++ b/libraries/stdlib/jvm/build.gradle
@@ -154,7 +154,6 @@ compileKotlin {
                 "-Xbuiltins-from-sources",
                 "-XXLanguage:+RangeUntilOperator",
                 "-Xno-new-java-annotation-targets",
-                "-Xuse-old-innerclasses-logic",
         ]
         moduleName = "kotlin-stdlib"
     }