diff --git a/build.gradle b/build.gradle
index 58564fb49b1..5021b4028b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,6 +18,14 @@ import org.jetbrains.kotlin.konan.target.*
 import org.jetbrains.kotlin.konan.properties.*
 import org.jetbrains.kotlin.konan.util.*
 
+buildscript {
+    apply from: "gradle/kotlinGradlePlugin.gradle"
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
+    }
+}
+import org.jetbrains.kotlin.konan.*
+
 defaultTasks 'clean', 'dist'
 
 convention.plugins.platformInfo = new PlatformInfo()
@@ -332,7 +340,7 @@ task bundle(type: (isWindows()) ? Zip : Tar) {
     dependsOn('crossDistPlatformLibs')
     dependsOn('crossDist')
     def simpleOsName = HostManager.simpleOsName()
-    baseName = "kotlin-native-$simpleOsName-${project.konanVersion}"
+    baseName = "kotlin-native-$simpleOsName-${KonanVersion.CURRENT}"
     from("$project.rootDir/dist") {
         include '**'
         exclude 'dependencies'
diff --git a/shared/buildSrc/build.gradle b/shared/buildSrc/build.gradle
index 0e9a8ff4d33..1ef7f192ef7 100644
--- a/shared/buildSrc/build.gradle
+++ b/shared/buildSrc/build.gradle
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 buildscript {
-    println("rootDir: $rootDir")
     ext.rootBuildDirectory = "$rootDir/../.."
     apply from: "$rootBuildDirectory/gradle/loadRootProperties.gradle"
     apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
diff --git a/shared/buildSrc/src/main/kotlin/org/jetbrains/kotlin/VersionGenerator.kt b/shared/buildSrc/src/main/kotlin/org/jetbrains/kotlin/VersionGenerator.kt
index 132c6a91313..2d99c2da75d 100644
--- a/shared/buildSrc/src/main/kotlin/org/jetbrains/kotlin/VersionGenerator.kt
+++ b/shared/buildSrc/src/main/kotlin/org/jetbrains/kotlin/VersionGenerator.kt
@@ -24,7 +24,9 @@ open class VersionGenerator: DefaultTask() {
                 val major = version[0].toInt()
                 val minor = version[1].toInt()
                 val maintenance = if (version.size > 2) version[2].toInt() else 0
-                val build = System.getenv("env.dep.Kotlin_KotlinNative_Master_KotlinNativeCheckout.build.counter")?.let {
+                val buildCounter = System.getenv("BUILD_NUMBER")
+                project.logger.info("BUILD_NUMBER: $buildCounter")
+                val build = buildCounter?.let {
                     it.split("-")[2].toInt() //7-dev-buildcount
                 }?: -1
                 val meta = project.properties["konanMetaVersion"]?.let { "MetaVersion.${it.toString().toUpperCase()}" } ?: "MetaVersion.DEV"
@@ -40,7 +42,19 @@ open class VersionGenerator: DefaultTask() {
                      |     val CURRENT = KonanVersion($meta, $major, $minor, $maintenance, $build)
                      |  }
                      |  private val versionString by lazy {
-                     |     "${'$'}{meta.name} ${'$'}major.${'$'}minor.${'$'}maintenance-${'$'}build".trim()
+                     |     buildString {
+                     |       append(major)
+                     |       append('.')
+                     |       append(minor)
+                     |       if (maintenance != 0) {
+                     |         append('.')
+                     |         append(maintenance)
+                     |       }
+                     |       append('-')
+                     |       append(meta.metaString)
+                     |       append('-')
+                     |       append(build)
+                     |     }
                      |  }
                      |  override fun toString() = versionString
                      |}
diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/MetaVersion.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/MetaVersion.kt
index 8d9246349a2..98f784c3b17 100644
--- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/MetaVersion.kt
+++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/MetaVersion.kt
@@ -21,10 +21,12 @@ package org.jetbrains.kotlin.konan
  *  scheme major.minor[.build[.revision]].
 */
 
-enum class MetaVersion {
-  DEV,
-  EAP,
-  ALPHA,
-  BETA,
-  RC
+enum class MetaVersion(val metaString:String) {
+  DEV("dev"),
+  EAP("eap"),
+  ALPHA("alpha"),
+  BETA("beta"),
+  RC1("rc1"),
+  RC2("rc2"),
+  REL("release")
 }
\ No newline at end of file