diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index ea7d98d24d85..71971d4c2d7b 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -726,10 +726,12 @@ def layoutJps(String home, String targetDir, String buildNumber, Closure additio
         module("forms-compiler")
         module("instrumentation-util")
         module("jps-builders")
-        module("jps-plugin-system")
         module("jps-standalone-builder")
         module("java-runtime")
       }
+      jar("jps-plugin-system.jar") {
+        module("jps-plugin-system")
+      }
       jar("groovy-jps-plugin.jar") {
         module("groovy-jps-plugin")
         module("groovy-rt-constants")