diff --git a/pkg/bootstrap-fedora-diaspora.sh b/pkg/bootstrap-fedora-diaspora.sh
index 7c0d267d0..4776968dd 100755
--- a/pkg/bootstrap-fedora-diaspora.sh
+++ b/pkg/bootstrap-fedora-diaspora.sh
@@ -48,20 +48,18 @@ getent passwd diaspora  >/dev/null || {
     echo "Created user diaspora"
 }
 
-home=$( getent passwd diaspora | cut -d: -f6)
-[ -e  $home/diaspora ] && {
-    echo "Moving existing  $home/diaspora out of the way"
-    mv  $home/diaspora  $home/diaspora.$$
-}
-mkdir $home/diaspora
-cp -ar * $home/diaspora
-chown -R diaspora  $home/diaspora
-
 service mongod start
 
 su - diaspora << EOF
 #set -x
 
+[ -e  diaspora ] && {
+    echo "Moving existing  diaspora out of the way"
+    mv  diaspora  diaspora.$$
+}
+
+git clone $GIT_REPO
+
 cd diaspora
 
 [ -e "\$HOME/.rvm/scripts/rvm" ] || {
@@ -96,6 +94,7 @@ if [[ -z "\$ruby" || ("\${ruby:0:4}" == "/usr") ]]; then
 fi
 
 bundle install
+#bundle exec jasmine init
 
 #Configure diaspora
 cp config/app_config.yml.example config/app_config.yml
@@ -106,7 +105,7 @@ init_appconfig config/app_config.yml "$DIASPORA_HOSTNAME"
 echo "Setting up DB..."
 if  bundle exec rake db:seed:dev ; then
     cat <<- EOM
-	DB ready. Login -> tom and password -> evankorth.
+	DB ready. Logins -> tom and korth, password -> evankorth.
 	More details ./diaspora/db/seeds/tom.rb. and ./diaspora/db/seeds/dev.rb.
 	EOM
 else
diff --git a/pkg/fedora/diaspora-setup b/pkg/fedora/diaspora-setup
index 4c5138571..0f62f5acc 100755
--- a/pkg/fedora/diaspora-setup
+++ b/pkg/fedora/diaspora-setup
@@ -33,8 +33,10 @@ ln -sf $libdir/diaspora-bundle/Gemfile.lock .
 test -e config/app_config.yml ||
     cp config/app_config.yml.example config/app_config.yml
 
+mv lib/tasks/jasmine.rake lib/tasks/jasmine.no-rake
+
 if bundle exec rake db:seed:dev; then
-    echo "Database config OK, new user tom/evankorth in place"
+    echo "Database config OK, users tom/evankorth, korth/evankorth in place"
 else
     cat <<- EOF
 
diff --git a/pkg/fedora/diaspora.spec b/pkg/fedora/diaspora.spec
index dc02467f4..0f751ed94 100644
--- a/pkg/fedora/diaspora.spec
+++ b/pkg/fedora/diaspora.spec
@@ -127,6 +127,8 @@ rm -fr $RPM_BUILD_ROOT
 %attr(-, diaspora, diaspora) %{_localstatedir}/lib/diaspora/tmp
 %attr(-, diaspora, diaspora) %{_localstatedir}/run/diaspora
 
+%{_datadir}/diaspora/master/pkg/fedora/dist
+%{_datadir}/diaspora/master/pkg/ubuntu/dist
 %{_datadir}/diaspora/master/tmp
 %{_datadir}/diaspora/master/public/uploads
 %{_datadir}/diaspora/master/log
diff --git a/pkg/ubuntu-setup.bash b/pkg/ubuntu-setup.bash
index 55ec1d2b7..ed97933bf 100755
--- a/pkg/ubuntu-setup.bash
+++ b/pkg/ubuntu-setup.bash
@@ -123,7 +123,7 @@ echo "Fetching and installing ruby gems.."
         echo "."
         sudo ruby setup.rb
         echo "."
-        sudo ln -s /usr/bin/gem1.8 /usr/bin/gem
+        sudo ln -sf /usr/bin/gem1.8 /usr/bin/gem
         echo "."
     fi
 )
@@ -146,6 +146,7 @@ echo "Installed bundler.."
     # Install extra gems
     echo "Installing more gems.."
     bundle install
+    bundle exec jasmine init
     echo "Installed."
 
     #Configure diaspora
@@ -180,7 +181,7 @@ echo "Installed bundler.."
     echo "Setting up DB..."
     if  rake db:seed:dev ; then
         cat <<- EOF
-	DB ready. Login -> tom and password -> evankorth.
+	DB ready. Logins -> tom or korth,  password -> evankorth.
 	More details ./diaspora/db/seeds/tom.rb. and ./diaspora/db/seeds/dev.rb.
 	EOF
     else
diff --git a/pkg/ubuntu/diaspora-setup b/pkg/ubuntu/diaspora-setup
index fadac58f8..d9e7d842e 100755
--- a/pkg/ubuntu/diaspora-setup
+++ b/pkg/ubuntu/diaspora-setup
@@ -37,8 +37,10 @@ ln -sf $libdir/diaspora-bundle/Gemfile.lock .
 test -e config/app_config.yml ||
     cp config/app_config.yml.example config/app_config.yml
 
+mv lib/tasks/jasmine.rake lib/tasks/jasmine.no-rake
+
 if bundle exec rake db:seed:dev; then
-    echo "Database config OK, new user tom/evankorth in place"
+    echo "Database config OK. Users korth/evankorth, tom/evankorth in place"
 else
     cat <<- EOF