diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index 42a805f2306..4f3287b6094 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -58,6 +58,8 @@ modules.moduleEntry('annotation_processing_gradle', kotlinAnnotationProcessingGr
 modules.moduleEntry('android_extensions', kotlinAndroidExtensionsVersion)
 modules.moduleEntry('compiler_runner', kotlinCompilerRunnerVersion)
 modules.moduleEntry('stdlib_jre7', kotlinStdLibJdk7Version)
+modules.moduleEntry('build_common', kotlinBuildCommonVersion)
+modules.moduleEntry('daemon_client', kotlinDaemonClientVersion)
 
 private static String configurationJar(x) {
     "kotlin_${x}_jar".toString()
diff --git a/dependencies/upload.gradle b/dependencies/upload.gradle
index 228e031dabf..be65da2b97f 100644
--- a/dependencies/upload.gradle
+++ b/dependencies/upload.gradle
@@ -29,7 +29,7 @@ task generatePom(type: DefaultTask) {
     inputs.file(originalPom)
 
     def (_, artifactIdString, versionString) = gradle.startParameter.projectProperties.module.tokenize(':')
-    def versionPath = "${versionString.tokenize('-')[0]}-SNAPSHOT"
+    def versionPath = versionString
 
     def newPom = file("${temporaryDir.canonicalPath}/$artifactIdString-${versionString}.pom")
     outputs.file(newPom)
@@ -69,7 +69,7 @@ bintray {
         def (groupId, artifactId, version) = gradle.startParameter.projectProperties.module.tokenize(':')
         def groupPath = groupId.replace('.', '/')
         def artifactPath = artifactId
-        def versionPath = "${version.tokenize('-')[0]}-SNAPSHOT"
+        def versionPath = version
         from project.files(gradle.startParameter.projectProperties.jar)
         from project.files(gradle.startParameter.projectProperties.src)
         from project.files(gradle.startParameter.projectProperties.doc)
diff --git a/gradle.properties b/gradle.properties
index b855be6b430..d77a99ede45 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,23 +23,24 @@ testDataVersion=1226829:id
 kotlinCompilerRepo=https://dl.bintray.com/jetbrains/kotlin-native-dependencies
 #kotlinCompilerRepo=http://oss.sonatype.org/content/repositories/snapshots
 #kotlinCompilerRepo=http://dl.bintray.com/kotlin/kotlin-dev
-kotlinCompilerVersion=1.2-20180212.074217-235
-kotlinScriptRuntimeVersion=1.2-20180212.074236-235
-kotlinStdLibVersion=1.2-20180212.074248-235
-kotlinReflectVersion=1.2-20180212.074230-235
+kotlinCompilerVersion=1.2.40-dev-610
+kotlinScriptRuntimeVersion=1.2.40-dev-610
+kotlinStdLibVersion=1.2.40-dev-610
+kotlinReflectVersion=1.2.40-dev-610
 konanVersion=0.6
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 
 ##
 # required for performance mesuarement tasks
 
-kotlinStdLibJdk7Version=1.2-20180211.161219-234
-kotlinStdLibJdk8Version=1.2-20180209.103010-228
-kotlinGradlePluginVersion=1.2-20180209.102945-228
-
-kotlinGradlePluginApiVersion=1.2-20180208.144029-227
-kotlinCompilerEmbeddableVersion=1.2-20180208.144022-227
-kotlinAnnotationProcessingGradleVersion=1.2-20180208.144011-227
-kotlinAndroidExtensionsVersion=1.2-20180208.144005-227
-kotlinCompilerRunnerVersion=1.2-20180207.165101-224
+kotlinStdLibJdk7Version=1.2.40-dev-610
+kotlinStdLibJdk8Version=1.2.40-dev-610
+kotlinGradlePluginVersion=1.2.40-dev-610
 
+kotlinGradlePluginApiVersion=1.2.40-dev-610
+kotlinCompilerEmbeddableVersion=1.2.40-dev-610
+kotlinAnnotationProcessingGradleVersion=1.2.40-dev-610
+kotlinAndroidExtensionsVersion=1.2.40-dev-610
+kotlinCompilerRunnerVersion=1.2.40-dev-610
+kotlinBuildCommonVersion=1.2.40-dev-610
+kotlinDaemonClientVersion=1.2.40-dev-610