diff --git a/project/build.scala b/project/build.scala
index b3e4ba4ab..61adf4122 100644
--- a/project/build.scala
+++ b/project/build.scala
@@ -3,7 +3,11 @@ import Keys._
 
 object SbtExtras extends Build {
   // This build creates a SBT plugin with handy features *and* bundles the SBT script for distribution.
-  val root = Project("sbt-packaging", file(".")) settings(Packaging.settings:_*)
+  val root = Project("sbt-packaging", file(".")) settings(Packaging.settings:_*) settings(
+    sbtVersion <<= sbtVersion apply { v =>
+      sys.props.getOrElse("sbt.build.version", sys.env.getOrElse("sbt.build.version", v))
+    }
+  )
 
   val meta = Project("metapackage", file("metapackage")) settings(MetaPackaging.settings(root):_*)
 }
diff --git a/project/packaging.scala b/project/packaging.scala
index 0bd2d3294..fc5486d36 100644
--- a/project/packaging.scala
+++ b/project/packaging.scala
@@ -190,7 +190,7 @@ object Packaging {
   )
   
   def makeWindowsXml(sbtVersion: String, sourceDir: File): scala.xml.Node = {
-    val version = (sbtVersion split "\\.") match {
+    val version = (sbtVersion split "[^\\d]" filterNot (_.isEmpty)) match {
         case Array(major,minor,bugfix, _*) => Seq(major,minor,bugfix, "1") mkString "."
         case Array(major,minor) => Seq(major,minor,"0","1") mkString "."
         case Array(major) => Seq(major,"0","0","1") mkString "."
diff --git a/project/project/plugins.scala b/project/project/plugins.scala
index b9561d413..cf7cd2c8f 100644
--- a/project/project/plugins.scala
+++ b/project/project/plugins.scala
@@ -6,7 +6,7 @@ object PluginBuild extends Build {
   
   val root = Project("root", file(".")) settings(
     resolvers += Resolver.url("scalasbt", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns),
-    addSbtPlugin("com.typesafe" % "sbt-native-packager" % "0.4.3"),
-    libraryDependencies += "net.databinder" %% "dispatch-http" % "0.8.6"
+    addSbtPlugin("com.typesafe" % "sbt-native-packager" % "0.4.4"),
+    libraryDependencies += "net.databinder" % "dispatch-http_2.9.1" % "0.8.6"
   )
 }