diff --git a/internal/compile-ivy/src/main/scala/sbt/compiler/ComponentCompiler.scala b/internal/compile-ivy/src/main/scala/sbt/compiler/ComponentCompiler.scala
index 5ba9a2d93..ee7e64e50 100644
--- a/internal/compile-ivy/src/main/scala/sbt/compiler/ComponentCompiler.scala
+++ b/internal/compile-ivy/src/main/scala/sbt/compiler/ComponentCompiler.scala
@@ -94,6 +94,7 @@ private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: Com
   private val ivySbt: IvySbt = new IvySbt(ivyConfiguration)
   // TODO: The actual sbt version may be different from the component manager's version
   private val sbtVersion = ComponentManager.version
+  private val buffered = new BufferedLogger(FullLogger(log))
 
   def apply(id: String): File = {
     val binID = binaryID(id)
@@ -115,7 +116,7 @@ private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: Com
               sourcesJar
             } getOrElse (throw new InvalidComponent(s"Couldn't retrieve default sources: module '$id'"))
 
-          log.debug(s"Fetching default sources: module '$id'")
+          buffered.debug(s"Fetching default sources: module '$id'")
           manager.files(id)(new IfMissing.Fallback(getAndDefineDefaultSources()))
 
         case version +: rest =>
@@ -126,7 +127,7 @@ private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: Com
               sourcesJar
             } getOrElse interfaceSources(rest)
 
-          log.debug(s"Fetching version-specific sources: module '$moduleName'")
+          buffered.debug(s"Fetching version-specific sources: module '$moduleName'")
           manager.files(moduleName)(new IfMissing.Fallback(getAndDefineVersionSpecificSources()))
       }
     IO.withTemporaryDirectory { binaryDirectory =>
@@ -135,7 +136,8 @@ private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: Com
       val xsbtiJars = manager.files(xsbtiID)(IfMissing.Fail)
 
       val sourceModuleVersions = VersionNumber(compiler.scalaInstance.actualVersion).cascadingVersions
-      AnalyzingCompiler.compileSources(interfaceSources(sourceModuleVersions), targetJar, xsbtiJars, id, compiler, log)
+      val sources = buffered bufferQuietly interfaceSources(sourceModuleVersions)
+      AnalyzingCompiler.compileSources(sources, targetJar, xsbtiJars, id, compiler, log)
 
       manager.define(binID, Seq(targetJar))
 
@@ -183,10 +185,10 @@ private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: Com
     val retrieveConfiguration = new RetrieveConfiguration(retrieveDirectory, Resolver.defaultRetrievePattern, false)
     val updateConfiguration = new UpdateConfiguration(Some(retrieveConfiguration), true, UpdateLogging.DownloadOnly)
 
-    log.info(s"Attempting to fetch ${dependenciesNames(module)}. This operation may fail.")
-    IvyActions.updateEither(module, updateConfiguration, UnresolvedWarningConfiguration(), LogicalClock.unknown, None, log) match {
+    buffered.info(s"Attempting to fetch ${dependenciesNames(module)}. This operation may fail.")
+    IvyActions.updateEither(module, updateConfiguration, UnresolvedWarningConfiguration(), LogicalClock.unknown, None, buffered) match {
       case Left(unresolvedWarning) =>
-        log.debug(s"Couldn't retrieve module ${dependenciesNames(module)}.")
+        buffered.debug(s"Couldn't retrieve module ${dependenciesNames(module)}.")
         None
 
       case Right(updateReport) =>
@@ -197,8 +199,8 @@ private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: Com
             (_, f) <- m.artifacts
           } yield f
 
-        log.debug(s"Files retrieved for ${dependenciesNames(module)}:")
-        log.debug(allFiles mkString ", ")
+        buffered.debug(s"Files retrieved for ${dependenciesNames(module)}:")
+        buffered.debug(allFiles mkString ", ")
 
         allFiles filter predicate match {
           case Seq() => None