diff --git a/build/download_kotlin.xml b/build/download_kotlin.xml
index 58d2a024c67c..4b1360bbadcc 100644
--- a/build/download_kotlin.xml
+++ b/build/download_kotlin.xml
@@ -1,21 +1,23 @@
 <project name="Download Kotlin" default="extract">
-  <property name="kotlin.version" value="0.12.613"/>
   <property name="kotlin.build.type.id" value="Kotlin_M12_Idea142branch150version"/>
   <property name="kotlin.build.selector" value=".lastSuccessful"/>
 
-  <target name="check_present">
+  <target name="get_latest">
+    <loadresource property="kotlin.build.number">
+      <url url="https://teamcity.jetbrains.com/guestAuth/app/rest/buildTypes/id:${kotlin.build.type.id}/builds/status:SUCCESS,count:1/number"/>
+    </loadresource>
+  </target>
+
+  <target name="check_present" depends="get_latest">
     <pathconvert property="kotlin.path" setonempty="false" pathsep=" ">
       <path>
-        <fileset dir="${basedir}" includes="kotlin-plugin-${kotlin.version}*.zip"/>
+        <fileset dir="${basedir}" includes="kotlin-plugin-${kotlin.build.number}.zip"/>
       </path>
     </pathconvert>
   </target>
 
   <target name="download" depends="check_present" unless="kotlin.path">
     <delete dir="${basedir}" includes="kotlin-plugin*.zip"/>
-    <loadresource property="kotlin.build.number">
-      <url url="https://teamcity.jetbrains.com/guestAuth/app/rest/buildTypes/id:${kotlin.build.type.id}/builds/status:SUCCESS,count:1/number"/>
-    </loadresource>
     <echo message="Downloading Kotlin build ${kotlin.build.number}"/>
     <property name="kotlin.path" value="${basedir}/kotlin-plugin-${kotlin.build.number}.zip"/>
     <get src="https://teamcity.jetbrains.com/guestAuth/repository/download/${kotlin.build.type.id}/${kotlin.build.number}/kotlin-plugin-${kotlin.build.number}.zip"