diff --git a/buildSrc/src/main/kotlin/intellijDependencies.kt b/buildSrc/src/main/kotlin/intellijDependencies.kt
index 40b4861a46f..3636b4ff6a9 100644
--- a/buildSrc/src/main/kotlin/intellijDependencies.kt
+++ b/buildSrc/src/main/kotlin/intellijDependencies.kt
@@ -83,6 +83,10 @@ object IntellijRootUtils {
     fun getRepositoryRootDir(project: Project): File = with (project.rootProject) {
         return File(intellijRepoDir(), "kotlin.build.custom.deps/${extra["versions.intellijSdk"]}")
     }
+
+    fun getIntellijRootDir(project: Project): File = with (project.rootProject) {
+        return File(getRepositoryRootDir(this), "intellij${if (isIntellijCommunityAvailable()) "" else "Ultimate"}")
+    }
 }
 
 fun ModuleDependency.includeIntellijCoreJarDependencies(project: Project) =
@@ -95,8 +99,7 @@ fun Project.isIntellijCommunityAvailable() = !(rootProject.extra["intellijUltima
 
 fun Project.isIntellijUltimateSdkAvailable() = (rootProject.extra["intellijUltimateEnabled"] as Boolean)
 
-fun Project.intellijRootDir() =
-        File(IntellijRootUtils.getRepositoryRootDir(this), "intellij${if (isIntellijCommunityAvailable()) "" else "Ultimate"}")
+fun Project.intellijRootDir() = IntellijRootUtils.getIntellijRootDir(project)
 
 fun Project.intellijUltimateRootDir() =
         if (isIntellijUltimateSdkAvailable())
diff --git a/buildSrc/src/main/kotlin/pill/plugin.kt b/buildSrc/src/main/kotlin/pill/plugin.kt
index 00dadf69df0..9a28b90a6a7 100644
--- a/buildSrc/src/main/kotlin/pill/plugin.kt
+++ b/buildSrc/src/main/kotlin/pill/plugin.kt
@@ -88,7 +88,7 @@ class JpsCompatiblePlugin : Plugin<Project> {
         platformVersion = project.extensions.extraProperties.get("versions.intellijSdk").toString()
         platformBaseNumber = platformVersion.substringBefore(".", "").takeIf { it.isNotEmpty() }
                 ?: error("Invalid platform version: $platformVersion")
-        platformDir = IntellijRootUtils.getRepositoryRootDir(project)
+        platformDir = IntellijRootUtils.getIntellijRootDir(project)
     }
 
     private fun pill(rootProject: Project) {
@@ -216,7 +216,7 @@ class JpsCompatiblePlugin : Plugin<Project> {
     }
 
     private fun attachPlatformSources(library: PLibrary): PLibrary {
-        val platformSourcesJar = File(platformDir, "sources/ideaIC-$platformVersion-sources.jar")
+        val platformSourcesJar = File(platformDir, "../sources/ideaIC-$platformVersion-sources.jar")
 
         if (library.classes.any { it.startsWith(platformDir) }) {
             return library.attachSource(platformSourcesJar)
@@ -226,8 +226,8 @@ class JpsCompatiblePlugin : Plugin<Project> {
     }
 
     private fun attachAsmSources(library: PLibrary): PLibrary {
-        val asmSourcesJar = File(platformDir, "asm-shaded-sources/asm-src-$platformBaseNumber.jar")
-        val asmAllJar = File(platformDir, "intellij/lib/asm-all.jar")
+        val asmSourcesJar = File(platformDir, "../asm-shaded-sources/asm-src-$platformBaseNumber.jar")
+        val asmAllJar = File(platformDir, "lib/asm-all.jar")
 
         if (library.classes.any { it == asmAllJar }) {
             return library.attachSource(asmSourcesJar)