diff --git a/aegir.make b/aegir.make
index 6eafe2de0958c46cebf5b94bb1ff20b364d0beb9..2755fb6a83b63a8217b6ef201d69ce6862627e0a 100644
--- a/aegir.make
+++ b/aegir.make
@@ -2,5 +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][type] = "get"
+projects[hostmaster][download][url] = "http://files.aegirproject.org/hostmaster-0.4-alpha8.tgz"
+projects[hostmaster][directory_name] = "hostmaster"
diff --git a/docs/INSTALL.txt b/docs/INSTALL.txt
index bbe2e501804efc7e991e1220c781249e340d804e..fc01b94068303c3199eae6efc1c1fcde9ac5914f 100644
--- a/docs/INSTALL.txt
+++ b/docs/INSTALL.txt
@@ -231,7 +231,7 @@ installing the right packages and preparing the Drupal frontend install for
 you. That script needs to be run as the aegir user created above.  This file
 is available alongside this one 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-alpha8
 
 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 785ee9daf7f8c554b01162e79a540e0585cf0a55..96aac13d2d905ada2ded735f7d0b44acff9f4ddc 100644
--- a/docs/UPGRADE.txt
+++ b/docs/UPGRADE.txt
@@ -37,7 +37,7 @@ Shell commands::
 
   export AEGIR_VERSION=HEAD
   export DRUPAL_DIR=/var/aegir/hostmaster-$AEGIR_VERSION
-  export OLD_DRUPAL_DIR=/var/aegir/hostmaster-0.4-alpha6
+  export OLD_DRUPAL_DIR=/var/aegir/hostmaster-0.4-alpha7
   export DRUSH_VERSION=All-versions-3.0
   export DRUSH_MAKE_VERSION=6.x-2.0-beta6
 
diff --git a/install.sh.txt b/install.sh.txt
index d68020e66b042b49fa36600de87f4d2a5aab4659..b20d18cc30c2efffc8190fc04a8252c0b0d8814f 100644
--- a/install.sh.txt
+++ b/install.sh.txt
@@ -31,7 +31,7 @@
 ########################################################################
 # basic variables, change before release
 AEGIR_DOMAIN=aegir.example.com 
-AEGIR_VERSION=HEAD
+AEGIR_VERSION=0.4-alpha8
 AEGIR_HOME=$HOME
 WEB_GROUP=www-data
 DRUSH_VERSION=All-versions-3.0