diff --git a/.idea/libraries/jps.xml b/.idea/libraries/jps.xml
new file mode 100644
index 00000000000..c5ceea9676a
--- /dev/null
+++ b/.idea/libraries/jps.xml
@@ -0,0 +1,20 @@
+<component name="libraryTable">
+  <library name="jps">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/ideaSDK/jps" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/model-api/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/model-serialization/testSrc" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/model-serialization/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/model-impl/testSrc" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/model-impl/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/antLayout/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/jps-builders/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/jps-builders/testSrc" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/standalone-builder/src" />
+    </SOURCES>
+    <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/jps" recursive="false" />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/jps_test.xml b/.idea/libraries/jps_test.xml
new file mode 100644
index 00000000000..08bd122ccd7
--- /dev/null
+++ b/.idea/libraries/jps_test.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="jps-test">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/ideaSDK/jps/test" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+    <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/jps/test" recursive="false" />
+  </library>
+</component>
\ No newline at end of file
diff --git a/jps-plugin/jps-plugin.iml b/jps-plugin/jps-plugin.iml
index 21f152906eb..1e732f59e2f 100644
--- a/jps-plugin/jps-plugin.iml
+++ b/jps-plugin/jps-plugin.iml
@@ -7,10 +7,11 @@
     </content>
     <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="ide-compiler-runner" />
     <orderEntry type="module" module-name="cli-common" />
     <orderEntry type="module" module-name="util" />
+    <orderEntry type="library" name="jps" level="project" />
+    <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
   </component>
 </module>
 
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 0ab63330555..b0ec711cc47 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -163,6 +163,8 @@
         <sequential>
             <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${basedir}/dependencies/ant-contrib.jar"/>
             <property name="core" value="ideaSDK/core"/>
+            <property name="jps" value="ideaSDK/jps"/>
+            <property name="jps-test" value="${jps}/test"/>
 
             <if>
                 <istrue value="${idea.sdk.fetch.needed}"/>
@@ -175,6 +177,8 @@
                     </delete>
 
                     <mkdir dir="${core}"/>
+                    <mkdir dir="${jps}"/>
+                    <mkdir dir="${jps-test}"/>
                     <get src="@{base.url.for.core}/core/intellij-core.jar" dest="${core}/intellij-core.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/annotations.jar" dest="${core}/annotations.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/cli-parser-1.1.jar" dest="${core}/cli-parser-1.1.jar" usetimestamp="true"/>
@@ -182,6 +186,23 @@
                     <get src="@{base.url}/core/picocontainer.jar" dest="${core}/picocontainer.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/trove4j.jar" dest="${core}/trove4j.jar" usetimestamp="true"/>
 
+                    <get src="@{base.url}/jps/asm4-all.jar" dest="${jps}/" usetimestamp="true"/>
+                    <get src="@{base.url}/jps/groovy-jps-plugin.jar" dest="${jps}/" usetimestamp="true"/>
+                    <get src="@{base.url}/jps/groovy_rt.jar" dest="${jps}/" usetimestamp="true"/>
+                    <get src="@{base.url}/jps/jdom.jar" dest="${jps}/" usetimestamp="true"/>
+                    <get src="@{base.url}/jps/jgoodies-forms.jar" dest="${jps}/" usetimestamp="true"/>
+                    <get src="@{base.url}/jps/jna.jar" dest="${jps}/" usetimestamp="true"/>
+                    <get src="@{base.url}/jps/jps-builders.jar" dest="${jps}/" usetimestamp="true"/>
+                    <get src="@{base.url}/jps/jps-model.jar" dest="${jps}/" usetimestamp="true"/>
+                    <get src="@{base.url}/jps/log4j.jar" dest="${jps}/" usetimestamp="true"/>
+                    <get src="@{base.url}/jps/nanoxml-2.2.3.jar" dest="${jps}/" usetimestamp="true"/>
+                    <get src="@{base.url}/jps/protobuf-2.4.1.jar" dest="${jps}/" usetimestamp="true"/>
+                    <get src="@{base.url}/jps/trove4j.jar" dest="${jps}/" usetimestamp="true"/>
+                    <get src="@{base.url}/jps/ui-designer-jps-plugin.jar" dest="${jps}/" usetimestamp="true"/>
+                    <get src="@{base.url}/jps/util.jar" dest="${jps}/" usetimestamp="true"/>
+
+                    <get src="@{base.url}/jps/test/jps-build-test.jar" dest="${jps-test}/" usetimestamp="true"/>
+
                     <get src="@{base.url}/@{build.zip}" dest="dependencies/download/@{build.zip}" usetimestamp="true"/>
 
                     <get src="@{base.url}/sources.zip" dest="dependencies/download/idea-sdk-sources.zip" usetimestamp="true"/>