diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index bf0b3abd3..c3744be56 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -3426,7 +3426,7 @@ object Classpaths {
 
   def unmanagedScalaLibrary: Initialize[Task[Seq[File]]] = Def.taskDyn {
     if (autoScalaLibrary.value && scalaHome.value.isDefined)
-      Def.task { scalaInstance.value.libraryJar :: Nil } else
+      Def.task { scalaInstance.value.libraryJars } else
       Def.task { Nil }
   }
 
diff --git a/sbt/src/sbt-test/dependency-management/artifact/build.sbt b/sbt/src/sbt-test/dependency-management/artifact/build.sbt
index 6e51258c1..dfc87e190 100644
--- a/sbt/src/sbt-test/dependency-management/artifact/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/artifact/build.sbt
@@ -15,7 +15,7 @@ lazy val root = (project in file("."))
     artifact in (Compile, packageBin) := mainArtifact,
     libraryDependencies ++= (if (baseDirectory.value / "retrieve" exists) publishedID :: Nil else Nil),
       // needed to add a jar with a different type to the managed classpath
-    unmanagedClasspath in Compile += scalaInstance.map(_.libraryJar).value,
+    unmanagedClasspath in Compile ++= scalaInstance.value.libraryJars.toSeq,
     classpathTypes := Set(tpe),
     check := checkTask(dependencyClasspath).value,
     checkFull := checkTask(fullClasspath).value
diff --git a/sbt/src/sbt-test/package/manifest/build.sbt b/sbt/src/sbt-test/package/manifest/build.sbt
index 65515e221..73ac1427d 100644
--- a/sbt/src/sbt-test/package/manifest/build.sbt
+++ b/sbt/src/sbt-test/package/manifest/build.sbt
@@ -12,7 +12,7 @@ mainClass := Some("jartest.Main")
 packageOptions in (Compile, packageBin) := {
   def manifestExtra = {
     val mf = new Manifest
-    mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, makeString(scalaInstance.value.libraryJar :: Nil))
+    mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, makeString(scalaInstance.value.libraryJars))
     mf
   }
   (packageOptions in (Compile, packageBin)).value :+ Package.JarManifest(manifestExtra)
diff --git a/sbt/src/sbt-test/package/resources/build.sbt b/sbt/src/sbt-test/package/resources/build.sbt
index b24be8e9c..51f5865e6 100644
--- a/sbt/src/sbt-test/package/resources/build.sbt
+++ b/sbt/src/sbt-test/package/resources/build.sbt
@@ -1,3 +1,5 @@
+import Path.makeString
+
 name := "Main Resources Test"
 
 version := "0.1"
@@ -8,7 +10,7 @@ packageOptions := {
   def manifestExtra = {
     import java.util.jar._
     val mf = new Manifest
-    mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, scalaInstance.value.libraryJar.getAbsolutePath)
+    mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, makeString(scalaInstance.value.libraryJars))
     mf
   }
   Package.JarManifest(manifestExtra) +: packageOptions.value