diff --git a/build/gant.xml b/build/gant.xml
index 5e8ca1dfac5b..cf349b7ef3af 100644
--- a/build/gant.xml
+++ b/build/gant.xml
@@ -2,6 +2,7 @@
   <dirname property="build.dir" file="${ant.file}"/>
   <property name="project.home" value="${build.dir}/.."/>
   <property name="gant.home" value="${project.home}/build/lib/gant"/>
+  <property name="gant.target" value="default"/>
 
   <path id="gant.classpath">
     <fileset dir="${gant.home}/lib">
@@ -14,6 +15,6 @@
   </taskdef>
 
   <target name="doGant">
-    <gant file="${gant.script}"/>
+    <gant file="${gant.script}" target="${gant.target}"/>
   </target>
 </project>
diff --git a/build/scripts/dist.gant b/build/scripts/dist.gant
index c7ce4335d956..677c4ba74dfc 100644
--- a/build/scripts/dist.gant
+++ b/build/scripts/dist.gant
@@ -82,6 +82,17 @@ target('default': 'The default target') {
             home, null, paths)
 }
 
+target('build-dist-jars' : 'Target to build jars from locally compiled classes') {
+  loadProject()
+  // load ApplicationInfo.xml properties
+  ant.xmlproperty(file: appInfoFile(), collapseAttributes: "true")
+
+  layoutAll([buildNumber: "IC-$snapshot",
+             system_selector: "IdeaIC${p("component.version.major")}",
+             tools_jar: true],
+            home, null, paths)
+}
+
 def layoutAll(Map args, String home, String out, Paths _paths = null) {
   Paths paths = _paths != null ? _paths : new Paths(out)
 
diff --git a/build/update.xml b/build/update.xml
index 5372bd479360..d8398ea75dfb 100644
--- a/build/update.xml
+++ b/build/update.xml
@@ -21,6 +21,7 @@
 
   <macrodef name="run">
     <attribute name="script"/>
+    <attribute name="target" default="default"/>
     <attribute name="deploy"/>
 
     <sequential>
@@ -29,6 +30,7 @@
         <jvmarg line="&quot;-Ddeploy=@{deploy}&quot;"/>
         <jvmarg line="&quot;-Dmodules.output=${modules.output}&quot;"/>
         <jvmarg line="&quot;-Dgant.script=@{script}&quot;"/>
+        <jvmarg line="&quot;-Dgant.target=@{target}&quot;"/>
 
         <classpath>
           <fileset dir="${project.home}/lib/ant/lib">
@@ -62,4 +64,10 @@
     <run script="${project.home}/build/scripts/layouts.gant"
          deploy="${project.home}/out/deploy"/>
   </target>
+
+  <target name="build-jars">
+    <run script="${project.home}/build/scripts/dist.gant"
+         target="build-dist-jars"
+         deploy="${project.home}/out/deploy"/>
+  </target>
 </project>
\ No newline at end of file