diff --git a/.gitignore b/.gitignore
index 31cd6f6cd36..4e23564ea5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ examples/.idea/workspace.xml
 confluence/target
 confluence/target
 out
+ideaSDK
 .idea/dictionaries/yozh.xml
 .idea/codeStyleSettings.xml
 .idea/workspace.xml
diff --git a/.idea/ant.xml b/.idea/ant.xml
index 37ffae42808..f128e62d687 100644
--- a/.idea/ant.xml
+++ b/.idea/ant.xml
@@ -34,6 +34,14 @@
       <maximumStackSize value="2" />
       <properties />
     </buildFile>
+    <buildFile url="file://$PROJECT_DIR$/update_dependencies.xml">
+      <additionalClassPath />
+      <antReference projectDefault="true" />
+      <customJdkName value="" />
+      <maximumHeapSize value="128" />
+      <maximumStackSize value="2" />
+      <properties />
+    </buildFile>
   </component>
 </project>
 
diff --git a/.idea/libraries/idea_full.xml b/.idea/libraries/idea_full.xml
new file mode 100644
index 00000000000..30b7644b98f
--- /dev/null
+++ b/.idea/libraries/idea_full.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="idea-full">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/ideaSDK/lib" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+    <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/lib" recursive="false" />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/intellij_core.xml b/.idea/libraries/intellij_core.xml
new file mode 100644
index 00000000000..d14331541a7
--- /dev/null
+++ b/.idea/libraries/intellij_core.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="intellij-core">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/ideaSDK/core" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+    <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/core" recursive="false" />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/IDEA.xml b/.idea/runConfigurations/IDEA.xml
new file mode 100644
index 00000000000..137959a7b23
--- /dev/null
+++ b/.idea/runConfigurations/IDEA.xml
@@ -0,0 +1,18 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="IDEA" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
+    <option name="VM_PARAMETERS" value="-Xmx500m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=250m -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system -Didea.config.path=../config" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="ENABLE_SWING_INSPECTOR" value="false" />
+    <option name="ENV_VARIABLES" />
+    <option name="PASS_PARENT_ENVS" value="true" />
+    <module name="idea" />
+    <envs />
+    <RunnerSettings RunnerId="Run" />
+    <ConfigurationWrapper RunnerId="Run" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/compiler/backend/backend.iml b/compiler/backend/backend.iml
index c2cb311107b..89c20773203 100644
--- a/compiler/backend/backend.iml
+++ b/compiler/backend/backend.iml
@@ -5,12 +5,13 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA 10.x" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="library" name="asm" level="project" />
     <orderEntry type="module" module-name="stdlib" />
+    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
   </component>
 </module>
 
diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml
index 0b81faef09d..87b178e8745 100644
--- a/compiler/cli/cli.iml
+++ b/compiler/cli/cli.iml
@@ -5,13 +5,14 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA 10.x" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="stdlib" />
     <orderEntry type="module" module-name="jet.as.java.psi" />
+    <orderEntry type="library" name="intellij-core" level="project" />
   </component>
 </module>
 
diff --git a/compiler/frontend.java/frontend.java.iml b/compiler/frontend.java/frontend.java.iml
index 51021970c69..94b95ad5bde 100644
--- a/compiler/frontend.java/frontend.java.iml
+++ b/compiler/frontend.java/frontend.java.iml
@@ -5,10 +5,11 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA 10.x" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="stdlib" />
+    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
   </component>
 </module>
 
diff --git a/compiler/frontend/frontend.iml b/compiler/frontend/frontend.iml
index 538b9791539..d0a04b011b4 100644
--- a/compiler/frontend/frontend.iml
+++ b/compiler/frontend/frontend.iml
@@ -5,8 +5,9 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA 10.x" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
   </component>
 </module>
 
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index 05bb0565855..e3a58fc3f6e 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -5,13 +5,14 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA 10.x" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="stdlib" />
     <orderEntry type="module" module-name="cli" />
+    <orderEntry type="library" name="idea-full" level="project" />
   </component>
 </module>
 
diff --git a/grammar/grammar.iml b/grammar/grammar.iml
index 538b9791539..c03fc491744 100644
--- a/grammar/grammar.iml
+++ b/grammar/grammar.iml
@@ -5,8 +5,9 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA 10.x" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="intellij-core" level="project" />
   </component>
 </module>
 
diff --git a/idea/idea.iml b/idea/idea.iml
index 39519927146..3b2a3f833e0 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="PLUGIN_MODULE" version="4">
+<module type="JAVA_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/src/META-INF/plugin.xml" />
   <component name="EclipseModuleManager">
     <libelement value="jar://$MODULE_DIR$/../lib/asm-util-3.3.1.jar!/" />
@@ -15,7 +15,7 @@
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA 10.x" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
@@ -23,6 +23,7 @@
     <orderEntry type="module" module-name="stdlib" />
     <orderEntry type="module" module-name="compiler-tests" />
     <orderEntry type="module" module-name="jet.as.java.psi" />
+    <orderEntry type="library" name="idea-full" level="project" />
   </component>
 </module>
 
diff --git a/update_dependencies.xml b/update_dependencies.xml
new file mode 100644
index 00000000000..6fe47687e80
--- /dev/null
+++ b/update_dependencies.xml
@@ -0,0 +1,34 @@
+<project name="Update Dependencies" default="update">
+    <property name="build.zip" value="ideaIC-112.SNAPSHOT.win.zip"/>
+
+    <target name="update">
+        <execute_update/>
+    </target>
+
+    <target name="jb_update">
+        <execute_update teamcity="http://buildserver.labs.intellij.net" teamcity.build="bt662"/>
+    </target>
+
+    <macrodef name="execute_update">
+        <attribute name="teamcity" default="http://teamcity.jetbrains.com"/>
+        <attribute name="teamcity.build" default="bt343"/>
+        <sequential>
+            <property name="core" value="ideaSDK/core"/>
+            <property name="tc" value="@{teamcity}/guestAuth/repository/download/@{teamcity.build}/.lastSuccessful"/>
+            <delete dir="ideaSDK" failonerror="false"/>
+            <mkdir dir="${core}"/>
+            <get src="${tc}/core/intellij-core.jar" dest="${core}"/>
+            <get src="${tc}/core/annotations.jar" dest="${core}"/>
+            <get src="${tc}/core/asm.jar" dest="${core}"/>
+            <get src="${tc}/core/asm-commons.jar" dest="${core}"/>
+            <get src="${tc}/core/cli-10.jar" dest="${core}"/>
+            <get src="${tc}/core/guava-r09.jar" dest="${core}"/>
+            <get src="${tc}/core/picocontainer.jar" dest="${core}"/>
+            <get src="${tc}/core/trove4j.jar" dest="${core}"/>
+    
+            <get src="${tc}/${build.zip}" dest="ideaSDK" />
+            <unzip src="ideaSDK/${build.zip}" dest="ideaSDK"/>
+            <delete file="ideaSDK/${build.zip}"/>
+        </sequential>
+    </macrodef>
+</project>