diff --git a/bin/sbt-setup b/bin/sbt-setup
index 9a8f5e577..f86037929 100755
--- a/bin/sbt-setup
+++ b/bin/sbt-setup
@@ -3,7 +3,8 @@
 
 PROJECT="$1"
 
-ORGANIZATION="improving"
+DEFAULT_PACKAGE="template"
+PACKAGE=${ORGANIZATION:-$DEFAULT_PACKAGE}
 SCALA_VERSION="2.8.1"
 SCALACHECK_VERSION="1.8"
 SPECS_VERSION="1.6.7"
@@ -55,7 +56,7 @@ EOF
 cat > project/build.properties <<EOF
 #Project properties
 #Generated by sbt-setup
-project.organization=$ORGANIZATION
+project.organization=$PACKAGE
 project.name=$PROJECT
 sbt.version=$SBT_VERSION
 project.version=0.1
@@ -66,7 +67,7 @@ EOF
 mkdir -p src/main/scala
 
 cat > src/main/scala/Main.scala <<EOF
-package $ORGANIZATION
+package $PACKAGE
 
 object Main {
   def main(args: Array[String]): Unit = {
@@ -78,7 +79,7 @@ EOF
 mkdir -p src/test/scala
 
 cat > src/test/scala/TemplateSpec.scala <<EOF
-package $ORGANIZATION
+package $PACKAGE
 
 import org.specs._