diff --git a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
index 2829be5dc813..28c25f29ec39 100644
--- a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
@@ -89,6 +89,7 @@ abstract class BaseIdeaProperties extends ProductProperties {
     productLayout.additionalPlatformJars.put("external-system-rt.jar", "external-system-rt")
     productLayout.additionalPlatformJars.put("jps-launcher.jar", "jps-launcher")
     productLayout.additionalPlatformJars.put("jps-builders.jar", "jps-builders")
+    productLayout.additionalPlatformJars.put("jps-builders-6.jar", "jps-builders-6")
     productLayout.additionalPlatformJars.putAll("jps-model.jar", ["jps-model-impl", "jps-model-serialization"])
     productLayout.additionalPlatformJars.put("forms_rt.jar", "forms-compiler")
     productLayout.additionalPlatformJars.putAll("resources.jar", ["resources", "resources-en"])
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index d07e0e47bf5f..1ff7c5f9f863 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -46,6 +46,9 @@ def layoutJps(String home, String targetDir, String buildNumber, Closure additio
         module("jps-standalone-builder")
         module("java-runtime")
       }
+      jar("jps-builders-6.jar") {
+        module("jps-builders-6")
+      }
       jar("jps-plugin-system.jar") {
         module("jps-plugin-system")
       }