diff --git a/build/gant.xml b/build/gant.xml
index f332c9aeba52..2ce6b235b5b1 100644
--- a/build/gant.xml
+++ b/build/gant.xml
@@ -29,6 +29,7 @@
        <include name="oromatcher.jar"/>
        <include name="cli-parser-*.jar"/>
        <include name="nanoxml-*.jar"/>
+       <include name="jsr166e.jar"/>
     </fileset>
   </path>
 
diff --git a/build/lib/jps/antlayout.jar b/build/lib/jps/antlayout.jar
index 84f9d068420d..8f6554dc67f3 100644
Binary files a/build/lib/jps/antlayout.jar and b/build/lib/jps/antlayout.jar differ
diff --git a/build/lib/jps/groovy-jps-plugin.jar b/build/lib/jps/groovy-jps-plugin.jar
index bb83b0fe09cf..5166341eb156 100644
Binary files a/build/lib/jps/groovy-jps-plugin.jar and b/build/lib/jps/groovy-jps-plugin.jar differ
diff --git a/build/lib/jps/groovy_rt.jar b/build/lib/jps/groovy_rt.jar
index f28c213f94b6..43d418bfe294 100644
Binary files a/build/lib/jps/groovy_rt.jar and b/build/lib/jps/groovy_rt.jar differ
diff --git a/build/lib/jps/jps-builders.jar b/build/lib/jps/jps-builders.jar
index b0b9c7ceda1f..b02ac27bc085 100644
Binary files a/build/lib/jps/jps-builders.jar and b/build/lib/jps/jps-builders.jar differ
diff --git a/build/lib/jps/jps-model.jar b/build/lib/jps/jps-model.jar
index b9ce2a7f8ff3..e56a781f9006 100644
Binary files a/build/lib/jps/jps-model.jar and b/build/lib/jps/jps-model.jar differ
diff --git a/build/lib/jps/ui-designer-jps-plugin.jar b/build/lib/jps/ui-designer-jps-plugin.jar
index 37c2855c86ff..69d7e02232b7 100644
Binary files a/build/lib/jps/ui-designer-jps-plugin.jar and b/build/lib/jps/ui-designer-jps-plugin.jar differ
diff --git a/build/lib/jps/util.jar b/build/lib/jps/util.jar
index ff6a7b8e0174..adef8f02bc9c 100644
Binary files a/build/lib/jps/util.jar and b/build/lib/jps/util.jar differ
diff --git a/jps/standalone-builder/jps-standalone-builder.iml b/jps/standalone-builder/jps-standalone-builder.iml
index eff77fd22d65..e861da7ba122 100644
--- a/jps/standalone-builder/jps-standalone-builder.iml
+++ b/jps/standalone-builder/jps-standalone-builder.iml
@@ -12,7 +12,7 @@
     <orderEntry type="module" module-name="jps-model-api" />
     <orderEntry type="library" name="cli-parser" level="project" />
     <orderEntry type="library" name="Ant" level="project" />
-    <orderEntry type="module" module-name="jps-model-serialization" />
+    <orderEntry type="module" module-name="jps-model-serialization" exported="" />
     <orderEntry type="module-library" scope="PROVIDED">
       <library>
         <CLASSES>
diff --git a/jps/standalone-builder/src/org/jetbrains/jps/gant/JpsGantTool.groovy b/jps/standalone-builder/src/org/jetbrains/jps/gant/JpsGantTool.groovy
index f5d81e6224a8..964d160d930a 100644
--- a/jps/standalone-builder/src/org/jetbrains/jps/gant/JpsGantTool.groovy
+++ b/jps/standalone-builder/src/org/jetbrains/jps/gant/JpsGantTool.groovy
@@ -24,6 +24,7 @@ import org.jetbrains.jps.model.JpsModel
 import org.jetbrains.jps.model.JpsProject
 import org.jetbrains.jps.model.java.JpsJavaExtensionService
 import org.jetbrains.jps.model.library.JpsOrderRootType
+import org.jetbrains.jps.model.serialization.JpsModelSerializationDataService
 import org.jetbrains.jps.model.serialization.JpsProjectLoader
 /**
  * @author nik
@@ -105,7 +106,8 @@ final class JpsGantTool {
   }
 
   private void loadProject(String path, JpsModel model, JpsGantProjectBuilder builder) {
-    JpsProjectLoader.loadProject(model.project, [:], path)
+    def pathVariables = JpsModelSerializationDataService.computeAllPathVariables(model.global)
+    JpsProjectLoader.loadProject(model.project, pathVariables, path)
     if (builder.getDataStorageRoot() == null) {
       builder.setDataStorageRoot(Utils.getDataStorageRoot(path))
     }