diff --git a/build.sbt b/build.sbt
index 6ab3f1e2a..a590f73a3 100644
--- a/build.sbt
+++ b/build.sbt
@@ -9,7 +9,7 @@ sbtVersion in Global := {
   }
 }
 
-scalaVersion in Global := "2.9.2"
+scalaVersion in Global := "2.10.2"
 
 crossScalaVersions := Seq("2.9.2", "2.10.2")
 
diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/bash-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/bash-template
index b4b9f255a..e76bdb037 100644
--- a/src/main/resources/com/typesafe/sbt/packager/archetypes/bash-template
+++ b/src/main/resources/com/typesafe/sbt/packager/archetypes/bash-template
@@ -249,12 +249,12 @@ run() {
   if [[ "$JAVA_OPTS" != "" ]]; then
     java_opts="${JAVA_OPTS}"
   fi
-  
+
   # run sbt
   execRunner "$java_cmd" \
     $(get_mem_opts $app_mem) \
-    ${java_opts} \
-    ${java_args[@]} \
+    ${java_opts[@]} \
+    "${java_args[@]}" \
     -cp "$(fix_classpath "$app_classpath")" \
     $app_mainclass \
     "${app_commands[@]}" \
diff --git a/src/sbt-test/debian/java-app-archetype/build.sbt b/src/sbt-test/debian/java-app-archetype/build.sbt
index c8c01ef1b..fb9163f5c 100644
--- a/src/sbt-test/debian/java-app-archetype/build.sbt
+++ b/src/sbt-test/debian/java-app-archetype/build.sbt
@@ -37,4 +37,7 @@ TaskKey[Unit]("check-script") <<= (stagingDirectory in Universal, name, streams)
   val output = Process("bash " + script.getAbsolutePath).!!
   val expected = "SUCCESS!"
   assert(output contains expected, "Failed to correctly run the main script!.  Found ["+output+"] wanted ["+expected+"]")
+  val expected2 = "Something with spaces"
+  val output2 = Process(Seq("bash", script.getAbsolutePath, "-Dresult.string="+expected2)).!!
+  assert(output2 contains expected2, "Failed to correctly run the main script with spaced java args!.  Found ["+output2+"] wanted ["+expected2+"]")
 }
diff --git a/src/sbt-test/debian/java-app-archetype/src/main/scala/test/Test.scala b/src/sbt-test/debian/java-app-archetype/src/main/scala/test/Test.scala
index 242dc2381..b65353426 100644
--- a/src/sbt-test/debian/java-app-archetype/src/main/scala/test/Test.scala
+++ b/src/sbt-test/debian/java-app-archetype/src/main/scala/test/Test.scala
@@ -1,5 +1,9 @@
 package test
 
 object Test extends App {
-  println("SUCCESS!")
+  Option(sys.props("result.string")) match {
+  	case Some(value) => println(value)
+  	case _ => println("SUCCESS!")
+  }
+  
 }
diff --git a/test-project/project/build.properties b/test-project/project/build.properties
index 0974fce44..37b489cb6 100644
--- a/test-project/project/build.properties
+++ b/test-project/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.0
+sbt.version=0.13.1
diff --git a/test-project/project/plugins.sbt b/test-project/project/plugins.sbt
index efffd4c8f..3edf28d10 100644
--- a/test-project/project/plugins.sbt
+++ b/test-project/project/plugins.sbt
@@ -2,4 +2,3 @@ resolvers += Resolver.typesafeRepo("releases")
 
 addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.2.0")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.6.3")