diff --git a/main/pending/ClasspathProject.scala b/main/pending/ClasspathProject.scala
index ccf8c04e1..cdcc1b2b9 100644
--- a/main/pending/ClasspathProject.scala
+++ b/main/pending/ClasspathProject.scala
@@ -11,7 +11,6 @@ package sbt
 	import Path._	
 	import Types._
 	import scala.xml.{Node => XNode,NodeSeq}
-	import scala.collection.mutable.{LinkedHashMap, LinkedHashSet}
 
 trait ClasspathProject
 {
@@ -244,7 +243,7 @@ object ClasspathProject
 		parseSimpleConfigurations(mapping getOrElse default).getOrElse(c, errMsg)
 	def internalDependencies(project: Project): Classpath =
 		TaskMap { (conf: Configuration) =>
-			val visited = new LinkedHashSet[(Project,String)]
+			val visited = asSet(new java.util.LinkedHashSet[(Project,String)])
 			def visit(p: Project, c: String)
 			{
 				val applicableConfigs = allConfigs(p, c)
@@ -260,7 +259,7 @@ object ClasspathProject
 			}
 			visit(project, conf.name)
 
-			val productsTasks = new LinkedHashSet[Task[Seq[Attributed[File]]]]
+			val productsTasks = asSet(new java.util.LinkedHashSet[Task[Seq[Attributed[File]]]])
 			for( (dep: ClasspathProject, c) <- visited )
 				if( (dep ne project) || conf.name != c )
 					productsTasks += products(dep, c)
diff --git a/util/classpath/ClasspathUtilities.scala b/util/classpath/ClasspathUtilities.scala
index 5e27b215b..e5394e63b 100644
--- a/util/classpath/ClasspathUtilities.scala
+++ b/util/classpath/ClasspathUtilities.scala
@@ -8,8 +8,8 @@ import java.lang.ref.{Reference, SoftReference, WeakReference}
 import java.io.File
 import java.net.{URI, URL, URLClassLoader}
 import java.util.Collections
-import scala.collection.Set
-import scala.collection.mutable.{HashSet, LinkedHashSet, ListBuffer}
+import scala.collection.{mutable, JavaConversions, Set}
+import mutable.{HashSet, ListBuffer}
 import IO.{createTemporaryDirectory, write}
 
 object ClasspathUtilities
@@ -124,7 +124,7 @@ object ClasspathUtilities
 	}
 	private def linkedSet[T](s: Iterable[T]): Set[T] =
 	{
-		val set = new LinkedHashSet[T]
+		val set: mutable.Set[T] = JavaConversions.asScalaSet(new java.util.LinkedHashSet[T])
 		set ++= s
 		set
 	}