diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt
index 41a057a0e50..d2cdd004137 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt
@@ -48,9 +48,11 @@ open class KaptTask : AbstractCompile() {
         val sourceRoots = SourceRoots.ForJvm.create(getSource(), rawSourceRoots)
         val compileClasspath = classpath.toList().filter(File::exists)
 
+        val pluginOptionsForKotlinCompile = kotlinCompileTask.pluginOptions
+
         args.moduleName = kotlinCompileTask.moduleName
-        args.pluginClasspaths = pluginOptions.classpath.toTypedArray()
-        args.pluginOptions = pluginOptions.arguments.toTypedArray()
+        args.pluginClasspaths = (pluginOptions.classpath + pluginOptionsForKotlinCompile.classpath).toSet().toTypedArray()
+        args.pluginOptions = (pluginOptions.arguments + pluginOptionsForKotlinCompile.arguments).toTypedArray()
         args.destinationAsFile = destinationDir
         args.classpathAsList = compileClasspath
         args.verbose = project.hasProperty("kapt.verbose") && project.property("kapt.verbose").toString().toBoolean() == true