diff --git a/TeamCityBuild.xml b/TeamCityBuild.xml
index 2868758a232..22d3846dc17 100644
--- a/TeamCityBuild.xml
+++ b/TeamCityBuild.xml
@@ -18,6 +18,7 @@
 
     <property name="plugin.zip" value="${artifact.output.path}/kotlin-plugin-${build.number}.zip"/>
     <property name="bare.plugin.zip" value="${artifact.output.path}/kotlin-bare-plugin-${build.number}.zip"/>
+    <property name="android-extensions.zip" value="${artifact.output.path}/kotlin-android-extensions-plugin-${build.number}.zip"/>
 
     <property name="kotlin.bare.plugin.xml" value="jps-plugin/bare-plugin/src/META-INF/plugin.xml"/>
     <property name="kotlin.bare.plugin.xml.bk" value="${version_substitute_dir}/kotlin.bare.plugin.xml.bk"/>
@@ -126,6 +127,10 @@
 
         <zipPlugin filename="${plugin.zip}" dir="Kotlin"/>
         <zipPlugin filename="${bare.plugin.zip}" dir="BareKotlin"/>
+
+        <zip destfile="${android-extensions.zip}">
+            <zipfileset prefix="META-INF" dir="${basedir}/plugins/android-idea-plugin/old_plugin" includes="plugin.xml" />
+        </zip>
     </target>
 
     <macrodef name="print-statistic">
diff --git a/plugins/android-idea-plugin/old_plugin/plugin.xml b/plugins/android-idea-plugin/old_plugin/plugin.xml
new file mode 100644
index 00000000000..ada072b80cb
--- /dev/null
+++ b/plugins/android-idea-plugin/old_plugin/plugin.xml
@@ -0,0 +1,13 @@
+<idea-plugin version="2" url="http://kotlinlang.org">
+    <id>org.jetbrains.kotlin.android</id>
+
+    <name>Kotlin Extensions For Android (obsolete)</name>
+    <description>This plugin is obsolete. Android Extensions are now inside the main Kotlin plugin.</description>
+    <version>1.0-obsolete</version>
+    <vendor url="http://www.jetbrains.com">JetBrains s.r.o.</vendor>
+
+    <idea-version since-build="141.1009" until-build="199.9999"/>
+
+    <depends optional="false">org.jetbrains.kotlin</depends>
+    <depends optional="false">org.jetbrains.android</depends>
+</idea-plugin>