diff --git a/build.xml b/build.xml
index 2bce5d60314..148f1c6e14c 100644
--- a/build.xml
+++ b/build.xml
@@ -329,7 +329,6 @@
               </fileset>
               <fileset dir="${basedir}/compiler/frontend.java/src" includes="META-INF/services/**"/>
               <fileset dir="${basedir}/compiler/backend/src" includes="META-INF/services/**"/>
-              <fileset dir="${basedir}/compiler/cli/" includes="misc/**"/>
 
               <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
               <zipgroupfileset dir="${basedir}/ideaSDK/core" includes="*.jar" excludes="util.jar"/>
@@ -668,6 +667,8 @@
 
             <!-- icons, etc. -->
             <fileset dir="idea/resources"/>
+            <!-- plugin.xml and friends -->
+            <fileset dir="idea/src" includes="META-INF/**"/>
         </jar>
         <sleep seconds="1"/>
         <jar jarfile="${output}/kotlin-for-upsource.jar">
diff --git a/compiler/cli/misc/registry.properties b/compiler/cli/misc/registry.properties
deleted file mode 100644
index 0f79c1f6e75..00000000000
--- a/compiler/cli/misc/registry.properties
+++ /dev/null
@@ -1 +0,0 @@
-ide.hide.excluded.files=false
\ No newline at end of file
diff --git a/idea/analysis/analysis.iml b/idea/analysis/analysis.iml
new file mode 100644
index 00000000000..98b78da30d0
--- /dev/null
+++ b/idea/analysis/analysis.iml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <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="jet.as.java.psi" />
+    <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
+    <orderEntry type="library" name="kotlin-runtime" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
+    <orderEntry type="module" module-name="serialization" />
+    <orderEntry type="module" module-name="serialization.java" />
+    <orderEntry type="module" module-name="descriptor.loader.java" />
+    <orderEntry type="module" module-name="eval4j" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../ideaSDK/core-analysis/intellij-core-analysis.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../ideaSDK/core/annotations.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="guava" level="project" />
+    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="js.frontend" />
+  </component>
+</module>
+
diff --git a/update_dependencies.xml b/update_dependencies.xml
index f75436c05a2..36346f53e2a 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -1,6 +1,6 @@
 <project name="Update Dependencies" default="update">
-    <property name="jb.buildserver.build.id" value="4479675"/>
-    <property name="public.buildserver.build.id" value="147780"/>
+    <property name="jb.buildserver.build.id" value="4530576"/>
+    <property name="public.buildserver.build.id" value="149643"/>
 
     <condition property="os.tag" value="win.zip">
       <os family="windows" />
@@ -242,6 +242,7 @@
         <sequential>
             <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${basedir}/dependencies/ant-contrib.jar"/>
             <property name="core" value="ideaSDK/core"/>
+            <property name="core-analysis" value="ideaSDK/core-analysis"/>
             <property name="jps" value="ideaSDK/jps"/>
             <property name="jps-test" value="${jps}/test"/>
 
@@ -256,9 +257,11 @@
                     </delete>
 
                     <mkdir dir="${core}"/>
+                    <mkdir dir="${core-analysis}"/>
                     <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.for.core}/core/intellij-core-analysis.jar" dest="${core-analysis}/intellij-core-analysis.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/annotations.jar" dest="${core}/annotations.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/guava-17.0.jar" dest="${core}/guava-17.0.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/picocontainer.jar" dest="${core}/picocontainer.jar" usetimestamp="true"/>