diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 23208442fa7..5881a44746a 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -295,7 +295,7 @@
     <fileTypeFactory implementation="org.jetbrains.kotlin.idea.KotlinJavaScriptMetaFileTypeFactory"/>
     <fileTypeFactory implementation="org.jetbrains.kotlin.idea.KotlinModuleFileFactory"/>
 
-    <compileServer.plugin classpath="jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-reflect.jar;kotlin-plugin.jar"/>
+    <compileServer.plugin classpath="jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-reflect.jar;kotlin-plugin.jar;kotlin-android-extensions-plugin.jar;kotlin-android-extensions-compiler-plugin.jar"/>
     <compiler.task execute="BEFORE" implementation="org.jetbrains.kotlin.idea.internal.makeBackup.MakeBackupCompileTask"/>
     <buildProcess.parametersProvider implementation="org.jetbrains.kotlin.idea.compiler.configuration.KotlinBuildProcessParametersProvider"/>
 
diff --git a/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt b/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt
index 5f71ef3cbc8..356015aeef1 100644
--- a/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt
+++ b/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt
@@ -29,7 +29,7 @@ import javax.xml.parsers.DocumentBuilderFactory
 public class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
     override fun getExtraArguments(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String> {
         val module = moduleBuildTarget.module
-        if (!hasAndroidJpsPlugin() || isAndroidModuleWithoutGradle(module)) return emptyList()
+        if (!hasAndroidJpsPlugin() || !isAndroidModuleWithoutGradle(module)) return emptyList()
 
         val pluginId = ANDROID_COMPILER_PLUGIN_ID
         val resPath = getAndroidResPath(module)
@@ -60,7 +60,7 @@ public class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
 
     override fun getClasspath(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String> {
         val module = moduleBuildTarget.module
-        if (!hasAndroidJpsPlugin() || isAndroidModuleWithoutGradle(module)) return emptyList()
+        if (!hasAndroidJpsPlugin() || !isAndroidModuleWithoutGradle(module)) return emptyList()
 
         val inJar = File(PathUtil.getJarPathForClass(javaClass)).isFile
         val manifestFile = getAndroidManifest(moduleBuildTarget.module)
@@ -91,7 +91,7 @@ public class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
     companion object {
         private val ANDROID_JPS_UTIL_CLASS_FQNAME = "org.jetbrains.jps.android.AndroidJpsUtil"
 
-        private val JAR_FILE_NAME = "android-compiler-plugin.jar"
+        private val JAR_FILE_NAME = "kotlin-android-extensions-compiler-plugin.jar"
         private val ANDROID_COMPILER_PLUGIN_ID = "org.jetbrains.kotlin.android"
 
         private val VARIANT_OPTION_NAME = "variant"