diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 0000000..d2cf05c
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,60 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# time to build: 160 seconds
+
+$script = <<SCRIPT
+
+apt-get --assume-yes update
+apt-get --assume-yes install git python-virtualenv
+
+# things to do as the user (vagrant)
+cat <<B2 >bootstrap2.sh
+#!/bin/bash -x
+
+echo User vagrant is now running $0 in:
+pwd
+
+cd 
+
+git clone https://github.com/timvideos/streaming-system.git
+# git clone https://github.com/CarlFK/streaming-system.git
+
+cd streaming-system/website
+cp private/settings.py.example private/settings.py
+make serve
+sleep 5
+
+cd ../tools/register
+python fake_register.py --ip 127.0.0.1 &
+sleep 5
+
+curl http://127.0.0.1:8000/example
+
+# eof: bootstrap2.sh
+B2
+chown vagrant ./bootstrap2.sh
+chmod u+x ./bootstrap2.sh
+
+su vagrant ./bootstrap2.sh
+
+SCRIPT
+
+VAGRANTFILE_API_VERSION = "2"
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+
+  config.vm.box = "precise64-current"
+  config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"
+  config.vm.provision "shell", inline: $script
+  config.vm.network "forwarded_port", guest: 8000, host: 8000,
+            auto_correct: true
+
+  config.vm.provider :virtualbox do |vb|
+     vb.gui = false
+     vb.customize ["modifyvm", :id, "--memory", "256"]
+     vb.customize ["modifyvm", :id, "--cpuexecutioncap", "80"]
+     vb.customize ["modifyvm", :id, "--cpus", "1"]
+  end
+
+end
+
diff --git a/tools/setup/05-update.sh b/tools/setup/05-update.sh
index 6ae5be4..855dd3e 100755
--- a/tools/setup/05-update.sh
+++ b/tools/setup/05-update.sh
@@ -13,6 +13,5 @@ sudo rm /etc/apt/apt.conf.d/02cache || true
 sudo rm /etc/apt/sources.list.d/*.save || true
 
 # Update the software
-sudo apt-get --assume-yes install aptitude
-sudo apt-get update
+sudo apt-get --assume-yes update
 sudo apt-get --assume-yes dist-upgrade
diff --git a/tools/setup/30-custom-flumotion.sh b/tools/setup/30-custom-flumotion.sh
index 1709dd9..a308651 100755
--- a/tools/setup/30-custom-flumotion.sh
+++ b/tools/setup/30-custom-flumotion.sh
@@ -57,9 +57,21 @@ fi
 sudo cp -rf ../flumotion-config/fromdeb/etc/* /usr/local/etc/
 sudo ln -sf /usr/local/etc/init.d/flumotion /etc/init.d/flumotion
 
-# Create a SSL certificate used for encryption.
-sudo make-ssl-cert /usr/share/ssl-cert/ssleay.cnf /usr/local/etc/flumotion/default.pem || true
-sudo chown flumotion:flumotion /usr/local/etc/flumotion/default.pem
+# setup SSL certificate used for encryption.
+CERT="/usr/local/etc/flumotion/default.pem"
+sudo DEBIAN_FRONTEND=noninteractive DEBCONF_DB_FALLBACK=Pipe make-ssl-cert /usr/share/ssl-cert/ssleay.cnf $CERT <<EOF
+Name: make-ssl-cert/hostname
+Template: make-ssl-cert/hostname
+Value: $HOST
+Owners: ssl-cert
+ 
+Name: make-ssl-cert/title
+Template: make-ssl-cert/title
+Value: Flumotion Certificate
+Owners: ssl-cert
+EOF
+
+sudo chown flumotion:flumotion $CERT
 
 # Give access to the firewire ports
 sudo adduser flumotion video
diff --git a/tools/setup/99-remove-ppa.sh b/tools/setup/99-remove-ppa.sh
index aca066d..506c655 100755
--- a/tools/setup/99-remove-ppa.sh
+++ b/tools/setup/99-remove-ppa.sh
@@ -8,4 +8,4 @@
 #
 
 # Remove the ppa files as they cause problems for puppet.
-rm /etc/apt/sources.list.d/*ppa*
+rm /etc/apt/sources.list.d/*ppa* || true
diff --git a/tools/setup/Vagrantfile b/tools/setup/Vagrantfile
new file mode 100644
index 0000000..efafb90
--- /dev/null
+++ b/tools/setup/Vagrantfile
@@ -0,0 +1,48 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# 1013 seconds to build. (15min)
+
+$script = <<SCRIPT
+
+apt-get install -y git-core
+
+# things to do as the user (vagrant)
+cat <<B2 >bootstrap2.sh
+#!/bin/bash -x
+
+if [ -f /vagrant/streaming-system/tools/setup/runall.sh ]; then 
+    # for testing before pushing to github
+    cp -av /vagrant/streaming-system .
+else
+    git clone https://github.com/timvideos/streaming-system.git
+    # git clone https://github.com/CarlFK/streaming-system.git
+fi
+
+streaming-system/tools/setup/runall.sh
+
+# eof: bootstrap2.sh
+B2
+chown vagrant ./bootstrap2.sh
+chmod u+x ./bootstrap2.sh
+
+su vagrant ./bootstrap2.sh
+
+SCRIPT
+
+VAGRANTFILE_API_VERSION = "2"
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+
+  config.vm.box = "precise64-current"
+  config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"
+  config.vm.provision "shell", inline: $script
+
+  config.vm.provider :virtualbox do |vb|
+     vb.gui = false
+     vb.customize ["modifyvm", :id, "--memory", "256"]
+     vb.customize ["modifyvm", :id, "--cpuexecutioncap", "60"]
+     vb.customize ["modifyvm", :id, "--cpus", "1"]
+  end
+
+end
+
diff --git a/website/Makefile b/website/Makefile
index 4c9d420..1950a5f 100644
--- a/website/Makefile
+++ b/website/Makefile
@@ -45,7 +45,8 @@ third_party:
 
 src/pip-delete-this-directory.txt: requirements.txt
 	$(ACTIVATE) && pip install -r requirements.txt
-	$(ACTIVATE) && [ -f private/requirements.txt ] && pip install -r private/requirements.txt
+	# $(ACTIVATE) && [ -f private/requirements.txt ] && pip install -r private/requirements.txt
+	$(ACTIVATE) && pip install -r private/requirements.txt || true
 	touch -r requirements.txt src/pip-delete-this-directory.txt
 
 install: lib/python2.6/site-packages/ez_setup.py lib/python2.6/site-packages/distribute-0.6.24-py2.6.egg-info src/pip-delete-this-directory.txt frontend/data.py
@@ -55,7 +56,10 @@ frontend/data.py: eventfeed2internal.py
 
 prepare-serve: install
 	$(ACTIVATE) && python manage.py collectstatic --noinput
-#	$(ACTIVATE) && python manage.py syncdb
+	# createsuperuser on a seperate line 
+	# for when vagrant skips the interactive prompting.
+	$(ACTIVATE) && python manage.py syncdb --noinput
+	$(ACTIVATE) && python manage.py createsuperuser || true
 
 lint: install
 	@# R0904 - Disable "Too many public methods" warning
@@ -85,7 +89,6 @@ upload:
 	$(ACTIVATE) && git-cl upload
 
 serve: prepare-serve install
-	$(ACTIVATE) && python manage.py syncdb
-	$(ACTIVATE) && python manage.py runserver
+	$(ACTIVATE) && python manage.py runserver &
 
 .PHONY : lint upload deploy serve clean config prepare-serve
diff --git a/website/requirements.txt b/website/requirements.txt
index f0f777c..137dc23 100644
--- a/website/requirements.txt
+++ b/website/requirements.txt
@@ -7,7 +7,7 @@ BeautifulSoup4
 django-live-server
 distribute>=0.6.14
 django-extensions
-ez-setup
+ez_setup
 gunicorn
 ordereddict
 pylint