diff --git a/launch/BootConfiguration.scala b/launch/BootConfiguration.scala
index de9b2a460..718dcb87f 100644
--- a/launch/BootConfiguration.scala
+++ b/launch/BootConfiguration.scala
@@ -16,6 +16,8 @@ private object BootConfiguration
 	val CompilerModuleName = "scala-compiler"
 	val LibraryModuleName = "scala-library"
 
+	val JUnitName = "junit"
+
 	val SbtOrg = "org.scala-tools.sbt"
 
 	/** The Ivy conflict manager to use for updating.*/
diff --git a/launch/Update.scala b/launch/Update.scala
index 09f39916f..9dd6d8c31 100644
--- a/launch/Update.scala
+++ b/launch/Update.scala
@@ -109,6 +109,7 @@ final class Update(config: UpdateConfiguration)
 			case u: UpdateScala =>
 				addDependency(moduleID, ScalaOrg, CompilerModuleName, scalaVersion, "default;optional(default)", u.classifiers)
 				addDependency(moduleID, ScalaOrg, LibraryModuleName, scalaVersion, "default", u.classifiers)
+				excludeJUnit(moduleID)
 				System.out.println("Getting Scala " + scalaVersion + " " + reason + "...")
 			case u: UpdateApp =>
 				val app = u.id
@@ -147,6 +148,7 @@ final class Update(config: UpdateConfiguration)
 		for(conf <- dep.getModuleConfigurations)
 			dep.addDependencyArtifact(conf, ivyArtifact)
 	}
+	private def excludeJUnit(module: DefaultModuleDescriptor): Unit = module.addExcludeRule(excludeRule(JUnitName, JUnitName))
 	private def excludeScala(module: DefaultModuleDescriptor)
 	{
 		def excludeScalaJar(name: String): Unit = module.addExcludeRule(excludeRule(ScalaOrg, name))
diff --git a/project/Util.scala b/project/Util.scala
index a8990ccc7..b132285d9 100644
--- a/project/Util.scala
+++ b/project/Util.scala
@@ -72,7 +72,6 @@ object Common
 	lazy val jsch = lib("com.jcraft" % "jsch" % "0.1.31" intransitive() )
 	lazy val sbinary = lib("org.scala-tools.sbinary" %% "sbinary" % "0.4.0" )
 	lazy val scalaCompiler = libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ )
-	lazy val excludeJUnit = ivyXML := <dependencies><exclude org="junit"/></dependencies>
 }
 object Licensed
 {