diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 7f7884683d3..cd57543d630 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -83,9 +83,10 @@ extra["versions.androidDxSources"] = "5.0.0_r2"
 extra["customDepsOrg"] = "kotlin.build"
 
 repositories {
-    maven("https://jetbrains.bintray.com/intellij-third-party-dependencies/")
-    maven("https://plugins.gradle.org/m2/")
     jcenter()
+    maven("https://jetbrains.bintray.com/intellij-third-party-dependencies/")
+    maven("https://kotlin.bintray.com/kotlin-dependencies")
+    gradlePluginPortal()
 
     extra["buildSrcKotlinRepo"]?.let {
         maven(url = it)
@@ -94,6 +95,8 @@ repositories {
 
 dependencies {
     compile(kotlin("stdlib", embeddedKotlinVersion))
+    compile("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.1")
+
     compile("net.rubygrapefruit:native-platform:${property("versions.native-platform")}")
     compile("net.rubygrapefruit:native-platform-windows-amd64:${property("versions.native-platform")}")
     compile("net.rubygrapefruit:native-platform-windows-i386:${property("versions.native-platform")}")
diff --git a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
new file mode 100644
index 00000000000..e854a1fe71f
--- /dev/null
+++ b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
@@ -0,0 +1,56 @@
+plugins {
+    kotlin("jvm") version "1.3.50"
+    `maven-publish`
+}
+
+group = "org.jetbrains.kotlin"
+version = "0.0.1"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation(kotlin("stdlib-jdk8"))
+    implementation(gradleApi())
+}
+
+tasks {
+    compileKotlin {
+        kotlinOptions.jvmTarget = "1.8"
+    }
+    compileTestKotlin {
+        kotlinOptions.jvmTarget = "1.8"
+    }
+}
+
+sourceSets {
+    main {
+        java.setSrcDirs(listOf("src"))
+    }
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("KotlinBuildGradlePlugin") {
+            from(components["java"])
+        }
+    }
+
+    repositories {
+        maven {
+            name = "bintray"
+            url = uri("https://api.bintray.com/maven/kotlin/kotlin-dependencies/kotlin-build-gradle-plugin")
+            authentication {
+                val mavenUser = findProperty("kotlin.bintray.user") as String?
+                val mavenPass = findProperty("kotlin.bintray.password") as String?
+                if (mavenUser != null && mavenPass != null) {
+                    credentials {
+                        username = mavenUser
+                        password = mavenPass
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/dependencies/kotlin-build-gradle-plugin/settings.gradle.kts b/dependencies/kotlin-build-gradle-plugin/settings.gradle.kts
new file mode 100644
index 00000000000..d80c3d410d6
--- /dev/null
+++ b/dependencies/kotlin-build-gradle-plugin/settings.gradle.kts
@@ -0,0 +1,2 @@
+rootProject.name = "kotlin-build-gradle-plugin"
+
diff --git a/buildSrc/src/main/kotlin/buildProperties.kt b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/buildProperties.kt
rename to dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
diff --git a/settings.gradle b/settings.gradle
index bac5a7460a7..9a6715b43fe 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,15 +9,28 @@ pluginManagement {
 
         if (cacheRedirectorEnabled == 'true') {
             logger.info("Using cache redirector for settings.gradle pluginManagement")
-            maven {
-                url "https://cache-redirector.jetbrains.com/plugins.gradle.org/m2"
-            }
+            maven { url "https://cache-redirector.jetbrains.com/plugins.gradle.org/m2" }
+            maven { url "https://cache-redirector.jetbrains.com/kotlin.bintray.com/kotlin-dependencies" }
         } else {
             gradlePluginPortal()
+            maven { url "https://kotlin.bintray.com/kotlin-dependencies" }
         }
     }
 }
 
+buildscript {
+    repositories {
+        if (cacheRedirectorEnabled == 'true') {
+            maven { url "https://cache-redirector.jetbrains.com/kotlin.bintray.com/kotlin-dependencies" }
+        } else {
+            maven { url "https://kotlin.bintray.com/kotlin-dependencies" }
+        }
+    }
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.1")
+    }
+}
+
 // modules
 include ":kotlin-build-common",
         ":benchmarks",