diff --git a/.gitignore b/.gitignore
index dfa683f4a2c..ecff4e2f26a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ dependencies
 dist
 gh-pages
 ideaSDK
+android-studio/sdk
 out
 pluginPublisher/idea*
 pluginPublisher/plugin-verifier.jar
diff --git a/.idea/libraries/android_studio.xml b/.idea/libraries/android_studio.xml
new file mode 100644
index 00000000000..8f80255a97a
--- /dev/null
+++ b/.idea/libraries/android_studio.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="android-studio">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/android-studio/sdk/lib" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+    <jarDirectory url="file://$PROJECT_DIR$/android-studio/sdk/lib" recursive="false" />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index fd74864453a..5d7708e9726 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Kotlin.iml" filepath="$PROJECT_DIR$/Kotlin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/android-studio/android-studio.iml" filepath="$PROJECT_DIR$/android-studio/android-studio.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/compiler/android-tests/android-tests.iml" filepath="$PROJECT_DIR$/compiler/android-tests/android-tests.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/compiler/backend/backend.iml" filepath="$PROJECT_DIR$/compiler/backend/backend.iml" group="compiler/java" />
       <module fileurl="file://$PROJECT_DIR$/compiler/backend-common/backend-common.iml" filepath="$PROJECT_DIR$/compiler/backend-common/backend-common.iml" group="compiler" />
diff --git a/.idea/runConfigurations/Android_Studio.xml b/.idea/runConfigurations/Android_Studio.xml
new file mode 100644
index 00000000000..2b87aac0fcc
--- /dev/null
+++ b/.idea/runConfigurations/Android_Studio.xml
@@ -0,0 +1,29 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Android Studio" type="Application" factoryName="Application">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
+    <option name="VM_PARAMETERS" value="-Didea.paths.selector=AndroidStudioPreview -Didea.platform.prefix=AndroidStudio -Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system -Didea.config.path=../config -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android-studio/sdk/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="android-studio" />
+    <envs />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="" />
+      <option name="TRANSPORT" value="0" />
+      <option name="LOCAL" value="true" />
+    </RunnerSettings>
+    <RunnerSettings RunnerId="Run" />
+    <ConfigurationWrapper RunnerId="Debug" />
+    <ConfigurationWrapper RunnerId="Run" />
+    <method>
+      <option name="BuildArtifacts" enabled="true">
+        <artifact name="KotlinPlugin" />
+      </option>
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/android-studio/android-studio.iml b/android-studio/android-studio.iml
new file mode 100644
index 00000000000..91f13ff44d1
--- /dev/null
+++ b/android-studio/android-studio.iml
@@ -0,0 +1,12 @@
+<?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$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="RUNTIME" name="android-studio" level="project" />
+    <orderEntry type="module" module-name="idea" scope="PROVIDED" />
+  </component>
+</module>
+
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 139f1728d1a..ad981e9d700 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -360,4 +360,78 @@
       <get src="http://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_KAnnotator_InferJdkAnnotations/shipWithKotlin.tcbuildtag/kotlin-android-sdk-annotations.jar"
            dest="dependencies/annotations/kotlin-android-sdk-annotations.jar" usetimestamp="true"/>
     </target>
+
+    <target name="get_android_studio">
+      <property name="android.version" value="0.4.6"/>
+      <property name="android.build.version" value="133.1028713"/>
+
+      <condition property="android.os.tag" value="windows">
+        <os family="windows" />
+      </condition>
+
+      <condition property="android.os.tag" value="mac">
+        <os family="mac" />
+      </condition>
+
+      <condition property="android.os.tag" value="linux">
+        <and>
+          <os family="unix" />
+          <not>
+            <os family="mac"/>
+          </not>
+        </and>
+      </condition>
+
+      <property name="android.file.name" value="android-studio-ide-${android.build.version}-${android.os.tag}.zip" />
+      <property name="android.studio.url" value="http://dl.google.com/dl/android/studio/ide-zips/${android.version}/${android.file.name}"/>
+      <property name="android.destination.dir" value="android-studio/sdk" />
+
+      <mkdir dir="dependencies/download"/>
+
+      <get src="${android.studio.url}" dest="dependencies/download" usetimestamp="true"/>
+
+      <delete dir="${android.destination.dir}" failonerror="false" includeemptydirs="true">
+        <exclude name="config/**"/>
+        <exclude name="system/**"/>
+      </delete>
+
+      <unzip src="dependencies/download/${android.file.name}" dest="${android.destination.dir}">
+        <cutdirsmapper dirs="1"/>
+      </unzip>
+
+      <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${basedir}/dependencies/ant-contrib.jar"/>
+      <if>
+        <matches pattern=".+windows\.zip" string="${android.file.name}"/>
+          <then>
+          </then>
+        <elseif>
+          <matches pattern=".+mac\.zip" string="${android.file.name}"/>
+          <then>
+            <exec executable="chmod">
+              <arg value="a+x"/>
+              <arg path="${android.destination.dir}/bin/fsnotifier"/>
+              <arg path="${android.destination.dir}/bin/inspect.sh"/>
+              <arg path="${android.destination.dir}/bin/printenv.py"/>
+              <arg path="${android.destination.dir}/bin/update_studio.sh"/>
+            </exec>
+          </then>
+        </elseif>
+        <elseif>
+          <matches pattern=".+linux\.zip" string="${android.file.name}"/>
+          <then>
+            <exec executable="chmod">
+              <arg value="a+x"/>
+              <arg path="${android.destination.dir}/bin/fsnotifier"/>
+              <arg path="${android.destination.dir}/bin/fsnotifier64"/>
+              <arg path="${android.destination.dir}/bin/inspect.sh"/>
+              <arg path="${android.destination.dir}/bin/studio.sh"/>
+              <arg path="${android.destination.dir}/bin/update_studio.sh"/>
+            </exec>
+          </then>
+        </elseif>
+        <else>
+          <fail message="File name '${android.file.name}' wasn't matched"/>
+        </else>
+      </if>
+    </target>
 </project>