diff --git a/aegir.make b/aegir.make
index f923a0b609dd43cd914593447282a8fc9928e4c9..b8d48c508259fedf84fb4fbbac370a0ef38708a6 100644
--- a/aegir.make
+++ b/aegir.make
@@ -4,6 +4,6 @@ api = 2
 projects[drupal][type] = "core"
 
 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-beta1.tgz"
+projects[hostmaster][download][directory_name] = "hostmaster"
diff --git a/docs/INSTALL.txt b/docs/INSTALL.txt
index 759b5b16ad2c39a55ee85efaa7890cf510514d47..7fd286f74fa719c6d6551081dc106cecd517a903 100644
--- a/docs/INSTALL.txt
+++ b/docs/INSTALL.txt
@@ -286,7 +286,7 @@ aegir user can access in order to execute it.  This file is available in
 Provision or can be downloaded through the web with this command::
 
 Shell commands::
- wget -O install.sh 'http://git.aegirproject.org/?p=provision.git;a=blob_plain;f=install.sh.txt;hb=HEAD'
+ wget -O install.sh 'http://git.aegirproject.org/?p=provision.git;a=blob_plain;f=install.sh.txt;hb=provision-0.4-beta1'
 
 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
@@ -317,7 +317,7 @@ the hostmaster-install command.
 
 Shell commands::
 
- drush hostmaster-install --version=HEAD
+ drush hostmaster-install --version=0.4-beta1
 
 You will be prompted for the required information if not provided on the
 commandline. See the inline help for the available options::
diff --git a/docs/UPGRADE.txt b/docs/UPGRADE.txt
index df5c635dd15dec5112991a39fbe72ac2a0269e1c..dd92647369582e5a0cf80b3ee27f19dc50e7a7c7 100644
--- a/docs/UPGRADE.txt
+++ b/docs/UPGRADE.txt
@@ -57,7 +57,7 @@ Make sure you download it to somewhere that the aegir user can access in order
 to execute it.
 
 Shell commands::
- wget -O upgrade.sh.txt 'http://git.aegirproject.org/?p=provision.git;a=blob_plain;f=upgrade.sh.txt;hb=HEAD'
+ wget -O upgrade.sh.txt 'http://git.aegirproject.org/?p=provision.git;a=blob_plain;f=upgrade.sh.txt;hb=provision-0.4-beta1'
  su -s /bin/sh aegir -c "sh upgrade.sh.txt aegir.example.com"
 
 Remember to replace aegir.example.com with the domain of your Aegir installation.
@@ -80,13 +80,13 @@ you are reading this document.
 
 Shell commands::
 
-  export AEGIR_VERSION=HEAD
+  export AEGIR_VERSION=0.4-beta1
   export AEGIR_DIR=/var/aegir
   export DRUPAL_DIR=$AEGIR_DIR/hostmaster-$AEGIR_VERSION
   export DRUSH_VERSION=6.x-3.3
   export DRUSH_MAKE_VERSION=6.x-2.0-beta9
   export AEGIR_DOMAIN=aegir.example.com
-  export OLD_DRUPAL_DIR=$AEGIR_DIR/hostmaster-0.4-alpha9
+  export OLD_DRUPAL_DIR=$AEGIR_DIR/hostmaster-0.4-alpha15
 
 This document also assumes drush is installed properly and we use an
 environment variable to simplify the documentation again.
diff --git a/install.sh.txt b/install.sh.txt
index 75dfd584f0b7c463a031e05c1354307379ed2898..fff181f8e21d3e1d6b34fc90fc4d7bb9ca16cb04 100644
--- a/install.sh.txt
+++ b/install.sh.txt
@@ -27,7 +27,7 @@
 # 3. delegate the rest of the install to hostmaster-install
 ########################################################################
 # basic variables, change before release
-AEGIR_VERSION="HEAD"
+AEGIR_VERSION="0.4-beta1"
 DRUSH_VERSION=6.x-3.3
 
 # when adding a variable here, add it to the display below
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index 933275f3be0264128ff37f6a7ecf330448d2b95c..98817a07595a69de32cc712bdb390f2a569a6ebe 100644
--- a/upgrade.sh.txt
+++ b/upgrade.sh.txt
@@ -11,7 +11,7 @@
 ########################################################################
 
 # basic variables, change before running
-AEGIR_VERSION=HEAD
+AEGIR_VERSION="0.4-beta1"
 AEGIR_DOMAIN=aegir.example.com
 
 AEGIR_DIR=/var/aegir