diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 870b2c52994e..b0315724e8e7 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -805,8 +805,9 @@ def layout_core(String home, String target) {
       module("annotations")
     }
 
-    jar("intellij-core-analysis-api.jar") {
+    jar("intellij-core-analysis.jar") {
       analysisApiModules.each { module it; }
+      analysisImplModules.each { module it; }
     }
 
     fileset(dir: "$home/lib") {
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index d64c75f799d0..e7a7161d5181 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -919,3 +919,12 @@ binding.setVariable("analysisApiModules", [
     "xml-psi-api",
     "xml-structure-view-api",
 ])
+binding.setVariable("analysisImplModules", [
+    "analysis-impl",
+    "core-impl",
+    "indexing-impl",
+    "java-analysis-impl",
+    "java-indexing-impl",
+    "java-psi-impl",
+    "projectModel-impl",
+])