diff --git a/compile/Eval.scala b/compile/Eval.scala
index 59deb160f..f75d301b7 100644
--- a/compile/Eval.scala
+++ b/compile/Eval.scala
@@ -114,7 +114,7 @@ final class Eval(optionsNoncp: Seq[String], classpath: Seq[File], mkReporter: Se
 			Nil,
 			List(Nil),
 			TypeTree(),
-			Block(List(Apply(Select(Super(This(emptyTypeName), emptyTypeName), nme.CONSTRUCTOR), Nil)), Literal(Constant(())))
+			Block(List(Apply(Select(Super(emptyTypeName, emptyTypeName), nme.CONSTRUCTOR), Nil)), Literal(Constant(())))
 		)
 
 		def method = DefDef(NoMods, WrapValName, Nil, Nil, tpt, tree)
diff --git a/launch/src/main/resources/sbt/sbt.boot.properties b/launch/src/main/resources/sbt/sbt.boot.properties
index c637d7f43..d7e1c6809 100644
--- a/launch/src/main/resources/sbt/sbt.boot.properties
+++ b/launch/src/main/resources/sbt/sbt.boot.properties
@@ -1,5 +1,5 @@
 [scala]
-  version: 2.9.0-1
+  version: 2.8.1
 
 [app]
   org: org.scala-tools.sbt
diff --git a/project/build.properties b/project/build.properties
index 48eaef7a7..bd4632a15 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -2,4 +2,4 @@ project.organization=org.scala-tools.sbt
 project.name=xsbt
 sbt.version=0.7.7
 project.version=0.9.10-SNAPSHOT
-build.scala.versions=2.9.0-1
+build.scala.versions=2.8.1
diff --git a/project/build/XSbt.scala b/project/build/XSbt.scala
index e7dd46131..97a83c96b 100644
--- a/project/build/XSbt.scala
+++ b/project/build/XSbt.scala
@@ -147,8 +147,8 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths
 	}
 	trait TestDependencies extends Project
 	{
-		val sc = "org.scala-tools.testing" % "scalacheck_2.9.0" % "1.8" % "test"
-		val sp = "org.scala-tools.testing" % "specs_2.9.0" % "1.6.8" % "test"
+		val sc = "org.scala-tools.testing" %% "scalacheck" % "1.8" % "test"
+		val sp = "org.scala-tools.testing" %% "specs" % "1.6.8" % "test"
 	}
 	class LogProject(info: ProjectInfo) extends Base(info) with TestDependencies
 	{
@@ -164,7 +164,7 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths
 	{
 		// these compilation options are useful for debugging caches and task composition
 		//override def compileOptions = super.compileOptions ++ List(Unchecked,ExplainTypes, CompileOption("-Xlog-implicits"))
-		val sbinary = "org.scala-tools.sbinary" % "sbinary_2.9.0" % "0.4.0"
+		val sbinary = "org.scala-tools.sbinary" %% "sbinary" % "0.4.0"
 	}
 	class Base(info: ProjectInfo) extends DefaultProject(info) with ManagedBase with Component with Licensed
 	{
@@ -271,7 +271,7 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths
 		
 		// sub projects for each version of Scala to precompile against other than the one sbt is built against
 		// each sub project here will add ~100k to the download
-		lazy val precompiled28 = precompiledSub("2.8.1")
+		lazy val precompiled29 = precompiledSub("2.9.0")
 		lazy val precompiled27 = precompiledSub("2.7.7")
 
 		def precompiledSub(v: String) =