diff --git a/tools/devcloud/basebuild/Vagrantfile b/tools/devcloud/basebuild/Vagrantfile
index bf7f2b6099a..a1f0740bc84 100644
--- a/tools/devcloud/basebuild/Vagrantfile
+++ b/tools/devcloud/basebuild/Vagrantfile
@@ -27,7 +27,7 @@ Vagrant::Config.run do |config|
 
   # Uncomment this line to enable the console for debugging the 
   # build process.
-  config.vm.boot_mode = :gui
+  #config.vm.boot_mode = :gui
 
   # Setup port forwarding
   config.vm.forward_port 22, 2222
diff --git a/tools/devcloud/build_vagrant_basebox.sh b/tools/devcloud/build_vagrant_basebox.sh
old mode 100644
new mode 100755
index 4f6c5273f27..1a9dc087b91
--- a/tools/devcloud/build_vagrant_basebox.sh
+++ b/tools/devcloud/build_vagrant_basebox.sh
@@ -31,20 +31,20 @@ export rvm_trust_rvmrcs_flag=1
 cd vagrant
 bundle install
 rake install
-cd ../veewee
+cd ~/builddevcloud/veewee
 bundle install
 rake install
-vagrant basebox define 'devcloudbase' 'ubuntu-12.04-server-i386'
+bundle exec vagrant basebox define 'devcloudbase' 'ubuntu-12.04-server-i386'
 wget --no-check-certificate -O ./definitions/devcloudbase/definition.rb https://git-wip-us.apache.org/repos/asf\?p\=incubator-cloudstack.git\;a\=blob_plain\;f\=tools/devcloud/veewee/definition.rb\;hb\=HEAD
 wget --no-check-certificate -O ./definitions/devcloudbase/postinstall.sh https://git-wip-us.apache.org/repos/asf\?p\=incubator-cloudstack.git\;a\=blob_plain\;f\=tools/devcloud/veewee/postinstall.sh\;hb\=HEAD
 wget --no-check-certificate -O ./definitions/devcloudbase/preseed.cfg https://git-wip-us.apache.org/repos/asf\?p\=incubator-cloudstack.git\;a\=blob_plain\;f\=tools/devcloud/veewee/preseed.cfg\;hb\=HEAD
-vagrant basebox build 'devcloudbase' -f -a -n
+bundle exec vagrant basebox build 'devcloudbase' -f -a -n
 # possibly use -r here too ^
-vagrant basebox export 'devcloudbase' -f
-vagrant basebox destroy 'devcloudbase' -f
-vagrant box add 'devcloudbase' 'devcloudbase.box' -f
+bundle exec vagrant basebox export 'devcloudbase' -f
+bundle exec vagrant basebox destroy 'devcloudbase' -f
+bundle exec vagrant box add 'devcloudbase' 'devcloudbase.box' -f
 rm -f devcloudbase.box
-cd ../vagrant
+cd ~/builddevcloud/vagrant
 mkdir devcloudbase
 cd devcloudbase
 mkdir puppet-devcloudinitial
@@ -62,5 +62,8 @@ wget --no-check-certificate -O puppet-devcloudinitial/manifests/init.pp "https:/
 
 vagrant up
 vagrant halt
-cd ..
+vagrant package default --output ~/devcloud.box
+vagrant destroy -f
+vagrant box remove devcloudbase virtualbox
 
+echo "Your new devcloud base box is stored in ~/devcloud.box"
diff --git a/tools/devcloud/devcloudbox/puppet-devcloud/manifests/init.pp b/tools/devcloud/devcloudbox/puppet-devcloud/manifests/init.pp
index b84ec265ddf..175e3265782 100644
--- a/tools/devcloud/devcloudbox/puppet-devcloud/manifests/init.pp
+++ b/tools/devcloud/devcloudbox/puppet-devcloud/manifests/init.pp
@@ -127,6 +127,8 @@ class puppet-devcloud {
     enable => 'true',
   }
 
+# TODO - it would be great to have an MD5 sum to check for each of these downloads, so that the files can be re-downloaded if they have been changed.
+
   exec { '/usr/bin/wget http://download.cloud.com/templates/devcloud/defaulttemplates/1/dc68eb4c-228c-4a78-84fa-b80ae178fbfd.vhd -P /opt/storage/secondary/template/tmpl/1/1/':
     creates => '/opt/storage/secondary/template/tmpl/1/1/dc68eb4c-228c-4a78-84fa-b80ae178fbfd.vhd',
     require => File['/opt/storage/secondary/template/tmpl/1/1/'],