diff --git a/plugins/lint/build.gradle.kts b/plugins/lint/build.gradle.kts
index 111084beb92..bdeb8e37bef 100644
--- a/plugins/lint/build.gradle.kts
+++ b/plugins/lint/build.gradle.kts
@@ -26,4 +26,3 @@ sourceSets {
     }
     "test" {}
 }
-
diff --git a/plugins/lint/build.gradle.kts.173 b/plugins/lint/build.gradle.kts.173
new file mode 100644
index 00000000000..4f33b500436
--- /dev/null
+++ b/plugins/lint/build.gradle.kts.173
@@ -0,0 +1,34 @@
+
+plugins {
+    java
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compile(project(":compiler:frontend"))
+    compile(project(":idea"))
+    compile(project(":idea:idea-jvm"))
+    compile(project(":idea:idea-core"))
+    compile(project(":idea:idea-android"))
+    compile(project(":plugins:uast-kotlin"))
+    compileOnly(project(":kotlin-android-extensions-runtime"))
+    compileOnly(intellijDep())
+    compileOnly(intellijPluginDep("android"))
+}
+
+sourceSets {
+    "main" {
+        java.srcDirs("android-annotations/src",
+                     "lint-api/src",
+                     "lint-checks/src",
+                     "lint-idea/src")
+    }
+    "test" {}
+}
+
+runtimeJar {
+    archiveName = "android-lint.jar"
+}
+
+ideaPlugin()
diff --git a/plugins/uast-kotlin-idea/build.gradle.kts b/plugins/uast-kotlin-idea/build.gradle.kts
index 308a3a3e73a..89363eff0f1 100644
--- a/plugins/uast-kotlin-idea/build.gradle.kts
+++ b/plugins/uast-kotlin-idea/build.gradle.kts
@@ -19,3 +19,8 @@ sourceSets {
     "test" {}
 }
 
+runtimeJar {
+    archiveName = "uast-kotlin-ide.jar"
+}
+
+ideaPlugin()
\ No newline at end of file
diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts
index 3c93d9440e0..9cc54f0ef75 100644
--- a/plugins/uast-kotlin/build.gradle.kts
+++ b/plugins/uast-kotlin/build.gradle.kts
@@ -48,3 +48,5 @@ testsJar {}
 projectTest {
     workingDir = rootDir
 }
+
+ideaPlugin()
\ No newline at end of file
diff --git a/plugins/uast-kotlin/build.gradle.kts.173 b/plugins/uast-kotlin/build.gradle.kts.173
index 854fb20e8b4..7a66941d5be 100644
--- a/plugins/uast-kotlin/build.gradle.kts.173
+++ b/plugins/uast-kotlin/build.gradle.kts.173
@@ -48,3 +48,5 @@ testsJar {}
 projectTest {
     workingDir = rootDir
 }
+
+ideaPlugin()
\ No newline at end of file
diff --git a/plugins/uast-kotlin/build.gradle.kts.as32 b/plugins/uast-kotlin/build.gradle.kts.as32
index e43fae77d87..42eea3abf9a 100644
--- a/plugins/uast-kotlin/build.gradle.kts.as32
+++ b/plugins/uast-kotlin/build.gradle.kts.as32
@@ -48,3 +48,5 @@ testsJar {}
 projectTest {
     workingDir = rootDir
 }
+
+ideaPlugin()
\ No newline at end of file
diff --git a/prepare/android-lint/build.gradle.kts b/prepare/android-lint/build.gradle.kts
deleted file mode 100644
index 1a1ed0036a0..00000000000
--- a/prepare/android-lint/build.gradle.kts
+++ /dev/null
@@ -1,29 +0,0 @@
-
-description = "Kotlin Android Lint"
-
-plugins {
-    `java-base`
-    id("jps-compatible-base")
-}
-
-val projectsToShadow = listOf(
-        ":plugins:lint",
-        ":plugins:uast-kotlin",
-        ":plugins:uast-kotlin-idea")
-
-sourceSets {
-    "main" {}
-    "test" {}
-}
-
-dependencies {
-    projectsToShadow.forEach { p ->
-        embeddedComponents(project(p)) { isTransitive = false }
-    }
-}
-
-runtimeJar {
-    fromEmbeddedComponents()
-}
-
-ideaPlugin()
diff --git a/settings.gradle b/settings.gradle
index b26c9555cc2..1476b1a8b81 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -118,7 +118,6 @@ include ":kotlin-build-common",
         ":prepare:ide-lazy-resolver",
         ":prepare:idea-plugin",
         ":prepare:cidr-plugin",
-        ":android-lint",
         ":kotlin-compiler",
         ":kotlin-compiler-embeddable",
         ":kotlin-compiler-client-embeddable",
@@ -225,7 +224,6 @@ project(':kotlin-android-extensions').projectDir = "$rootDir/prepare/android-ext
 project(':kotlin-android-extensions-runtime').projectDir = "$rootDir/plugins/android-extensions/android-extensions-runtime" as File
 project(':plugins:android-extensions-ide').projectDir = "$rootDir/plugins/android-extensions/android-extensions-idea" as File
 project(':plugins:android-extensions-jps').projectDir = "$rootDir/plugins/android-extensions/android-extensions-jps" as File
-project(':android-lint').projectDir = "$rootDir/prepare/android-lint" as File
 project(':kotlin-allopen-compiler-plugin').projectDir = "$rootDir/plugins/allopen/allopen-cli" as File
 project(':allopen-ide-plugin').projectDir = "$rootDir/plugins/allopen/allopen-ide" as File
 project(':kotlin-noarg-compiler-plugin').projectDir = "$rootDir/plugins/noarg/noarg-cli" as File