diff --git a/libraries/tools/kotlin-gradle-plugin-core/pom.xml b/libraries/tools/kotlin-gradle-plugin-core/pom.xml
index 26a86bf4dab..d9537894d63 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/pom.xml
+++ b/libraries/tools/kotlin-gradle-plugin-core/pom.xml
@@ -78,9 +78,6 @@
             <resource>
                 <directory>${project.basedir}/src/main/resources</directory>
             </resource>
-            <resource>
-                <directory>${project.build.outputDirectory}/../groovyOutput</directory>
-            </resource>
         </resources>
 
         <plugins>
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index 86ae3cd471b..4dfd6b6eba3 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -57,8 +57,8 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments>() : AbstractCo
             return
         }
 
-        populateTargetSpecificArgs(args)
         populateCommonArgs(args, sources)
+        populateTargetSpecificArgs(args)
         callCompiler(args)
         afterCompileHook(args)
     }
@@ -104,11 +104,11 @@ public open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments
         val extraProperties = getExtensions().getExtraProperties()
         args.pluginClasspaths = extraProperties.get("compilerPluginClasspaths") as? Array<String>
         args.pluginOptions = extraProperties.get("compilerPluginArguments") as? Array<String>
+        // show kotlin compiler where to look for java source files
+        args.freeArgs = (args.freeArgs + getJavaSourceRoots().map { it.getAbsolutePath() }).toSet().toList()
 
         if (StringUtils.isEmpty(kotlinOptions.classpath)) {
-            val existingClasspathEntries = getClasspath().filter({ it != null && it.exists() })
-            val effectiveClassPath = (getJavaSourceRoots() + existingClasspathEntries).makeString(File.pathSeparator)
-            args.classpath = effectiveClassPath
+            args.classpath = getClasspath().filter({ it != null && it.exists() }).joinToString(File.pathSeparator)
         }
 
         args.destination = if (StringUtils.isEmpty(kotlinOptions.destination)) {
diff --git a/libraries/tools/kotlin-gradle-plugin/pom.xml b/libraries/tools/kotlin-gradle-plugin/pom.xml
index 797b85b5222..797b0869929 100644
--- a/libraries/tools/kotlin-gradle-plugin/pom.xml
+++ b/libraries/tools/kotlin-gradle-plugin/pom.xml
@@ -72,9 +72,6 @@
                 <directory>${project.basedir}/src/main/resources</directory>
               <filtering>true</filtering>
             </resource>
-            <resource>
-                <directory>${project.build.outputDirectory}/../groovyOutput</directory>
-            </resource>
         </resources>
 
         <plugins>
@@ -96,7 +93,6 @@
                         <configuration>
                             <sourceDirs>
                                 <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
-                                <sourceDir>${project.build.outputDirectory}/../groovyOutput</sourceDir>
                             </sourceDirs>
                         </configuration>
                     </execution>
@@ -166,7 +162,6 @@
                                     </includes>
                                 </fileset>
                             </sources>
-                            <outputDirectory>${project.build.outputDirectory}/../groovyOutput</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java
index f98e563db2e..4b660ff5c29 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java
@@ -104,9 +104,6 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase<K2JVMCompilerArgumen
         }
 
         ArrayList<String> classpathList = new ArrayList<String>(classpath);
-        if (classpathList.remove(output)) {
-            LOG.debug("Removed target directory from compiler classpath (" + output + ")");
-        }
 
         if (!classpathList.isEmpty()) {
             String classPathString = join(classpathList, File.pathSeparator);