diff --git a/aegir.make b/aegir.make
index be947a648ba47ffe4da8ea7a841f1f63f0bf050c..ea3ba260b2f9563b1b1857aaf35c2144cb86ebfb 100644
--- a/aegir.make
+++ b/aegir.make
@@ -2,6 +2,6 @@ core = 6.x
 projects[] = "drupal"
 
 projects[hostmaster][type] = "profile"
-projects[hostmaster][download][type] = "git"
-projects[hostmaster][download][url] = "git://git.aegirproject.org/hostmaster.git"
-projects[hostmaster][download][branch] = "master"
+projects[hostmaster][download][type] = "get"
+projects[hostmaster][download][url] = "http://files.aegirproject.org/hostmaster-0.4-alpha10.tgz"
+projects[hostmaster][directory_name] = "hostmaster"
diff --git a/docs/INSTALL.txt b/docs/INSTALL.txt
index 1953c1f1b92ad215200b0bd7fe580fbc02a6a1c1..14ec1a71b837dc1b5c6fb1b9688a96a80e2a0992 100644
--- a/docs/INSTALL.txt
+++ b/docs/INSTALL.txt
@@ -249,7 +249,7 @@ preparing the backend and frontend install for you. That script needs to be run
 as the aegir user created above.  This file is available in Provision or can be 
 downloaded through the web at:
 
-http://git.aegirproject.org/?p=provision.git;a=blob_plain;f=install.sh.txt;hb=HEAD
+http://git.aegirproject.org/?p=provision.git;a=blob_plain;f=install.sh.txt;hb=provision-0.4-alpha10
 
 By default, the install script will install the "correct" version of Aegir
 (ie. if it was downloaded through git, it will install the version from the
diff --git a/docs/UPGRADE.txt b/docs/UPGRADE.txt
index 3d98dbecb3fb0e9e523aaa3430a1d9096e766933..b662593c3034ef76899464951880d6d30061421f 100644
--- a/docs/UPGRADE.txt
+++ b/docs/UPGRADE.txt
@@ -35,7 +35,7 @@ you are reading this document.
 
 Shell commands::
 
-  export AEGIR_VERSION=HEAD
+  export AEGIR_VERSION=0.4-alpha10
   export DRUPAL_DIR=/var/aegir/hostmaster-$AEGIR_VERSION
   export DRUSH_VERSION=6.x-3.3
   export DRUSH_MAKE_VERSION=6.x-2.0-beta8
diff --git a/install.sh.txt b/install.sh.txt
index e4ebd09c2cb0e1c67281abf05bf8c1a0fbfb9913..d35582f1255388a39d0450acfb20941fe19c95bc 100644
--- a/install.sh.txt
+++ b/install.sh.txt
@@ -30,7 +30,8 @@
 #
 ########################################################################
 # basic variables, change before release
-AEGIR_VERSION="HEAD"
+
+AEGIR_VERSION="0.4-alpha10"
 DRUSH_VERSION=6.x-3.3
 
 # when adding a variable here, add it to the display below
diff --git a/platform/install.provision.inc b/platform/install.provision.inc
index 29dc5da6ac26b6266a8109504967cfd27383e653..17a31b54af2052a68edae0f1d3e8a31989f463d9 100644
--- a/platform/install.provision.inc
+++ b/platform/install.provision.inc
@@ -49,9 +49,11 @@ function drush_provision_drupal_provision_install() {
  // Requires at least the database settings to complete.
   provision_prepare_environment();
   _provision_drupal_create_settings_file();
-  drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_SITE);
+
   provision_save_site_data();
 
+  drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_SITE);
+
   // call a backend task to do the actual installation.
   $result = provision_backend_invoke(d()->name, "provision-install-backend");
   // pass the login link back to the front end.