diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 74f6e59fc8ea..bbb1cbb98088 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -154,17 +154,23 @@ private boolean ensureKotlinCompilerAddedToClassPath() {
     return true
   }
 
-  def kotlinPluginLibPath = "$home/build/dependencies/build/kotlin/Kotlin/lib"
-  if (!new File(kotlinPluginLibPath).exists()) {
-    kotlinPluginLibPath = "$home/community/build/dependencies/build/kotlin/Kotlin/lib"
+  def kotlinHomePath = "$home/build/dependencies/build/kotlin/Kotlin"
+  if (!new File(kotlinHomePath).exists()) {
+    kotlinHomePath = "$home/community/build/dependencies/build/kotlin/Kotlin"
   }
-  if (!new File(kotlinPluginLibPath, "kotlin-runtime.jar").exists()) {
-    projectBuilder.error("Could not find Kotlin JARs at $kotlinPluginLibPath: run `./gradlew setupKotlinPlugin` in dependencies module " +
-                         "to download Kotlin JARs")
-    return false
+  def kotlinPluginLibPath = "$kotlinHomePath/lib"
+  def kotlincLibPath = "$kotlinHomePath/kotlinc/lib"
+  if (new File(kotlinPluginLibPath).exists() && new File(kotlincLibPath).exists()) {
+    ["jps/kotlin-jps-plugin.jar", "kotlin-plugin.jar", "kotlin-reflect.jar"].each {
+      BuildUtils.addToJpsClassPath("$kotlinPluginLibPath/$it", ant)
+    }
+    ["kotlin-runtime.jar"].each {
+      BuildUtils.addToJpsClassPath("$kotlincLibPath/$it", ant)
+    }
   }
-  ["jps/kotlin-jps-plugin.jar", "kotlin-plugin.jar", "kotlin-runtime.jar", "kotlin-reflect.jar"].each {
-    BuildUtils.addToJpsClassPath("$kotlinPluginLibPath/$it", ant)
+  else {
+    projectBuilder.error(
+      "Could not find Kotlin JARs at $kotlinPluginLibPath and $kotlincLibPath: run `./gradlew setupKotlinPlugin` in dependencies module to download Kotlin JARs")
   }
   return true
 }