diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index abf739781f..8929a0ad57 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -1,6 +1,10 @@
+package akka
+
 import sbt._
 import Keys._
+import com.typesafe.sbtmultijvm.MultiJvmPlugin
 import MultiJvmPlugin.{ MultiJvm, extraOptions, jvmOptions, scalatestOptions }
+import com.typesafe.sbtscalariform.ScalariformPlugin
 import ScalariformPlugin.{ format, formatPreferences }
 import java.lang.Boolean.getBoolean
 
@@ -364,7 +368,7 @@ object AkkaBuild extends Build {
     (dir, s) => {
       s.log.info("Building reStructuredText documentation...")
       val exitCode = Process(List("make", "clean", "html", "pdf"), dir) ! s.log
-      if (exitCode != 0) error("Failed to build docs.")
+      if (exitCode != 0) sys.error("Failed to build docs.")
       s.log.info("Done building docs.")
       dir
     }
diff --git a/project/Publish.scala b/project/Publish.scala
index 8f5997edb2..38dbdabc8e 100644
--- a/project/Publish.scala
+++ b/project/Publish.scala
@@ -1,3 +1,5 @@
+package akka
+
 import sbt._
 import Keys._
 import java.io.File
diff --git a/project/Unidoc.scala b/project/Unidoc.scala
index 2673e602fe..c8f13b02ac 100644
--- a/project/Unidoc.scala
+++ b/project/Unidoc.scala
@@ -1,3 +1,5 @@
+package akka
+
 import sbt._
 import Keys._
 import Project.Initialize
diff --git a/project/build.properties b/project/build.properties
index f47a3009ec..182dfa07ef 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.10.1
+sbt.version=0.11.0-RC1
diff --git a/project/plugins.sbt b/project/plugins.sbt
new file mode 100644
index 0000000000..c9c4dadf1f
--- /dev/null
+++ b/project/plugins.sbt
@@ -0,0 +1,10 @@
+
+resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/"
+
+addSbtPlugin("com.typesafe.sbtmultijvm" % "sbt-multi-jvm" % "0.1.6")
+
+addSbtPlugin("com.typesafe.sbtscalariform" % "sbt-scalariform" % "0.1.3")
+
+libraryDependencies += "org.scalariform" % "scalariform_2.9.0" % "0.1.0"
+
+scalacOptions += "-deprecation"
\ No newline at end of file
diff --git a/project/plugins/build.sbt b/project/plugins/build.sbt
deleted file mode 100644
index 8db73933f3..0000000000
--- a/project/plugins/build.sbt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/"
-
-libraryDependencies += "com.typesafe.sbt-multi-jvm" %% "sbt-multi-jvm" % "0.1.4"
-
-libraryDependencies += "com.typesafe.sbt-scalariform" %% "sbt-scalariform" % "0.1.2"