diff --git a/aegir.make b/aegir.make
index 5f72dc88fcba450287d20f735b6386b163aac595..f923a0b609dd43cd914593447282a8fc9928e4c9 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]  = "get"
-projects[hostmaster][download][url] = "http://files.aegirproject.org/hostmaster-0.4-beta2.tgz"
-projects[hostmaster][download][directory_name] = "hostmaster"
+projects[hostmaster][download][type] = "git"
+projects[hostmaster][download][url] = "git://git.aegirproject.org/hostmaster.git"
+projects[hostmaster][download][branch] = "master"
diff --git a/docs/INSTALL.txt b/docs/INSTALL.txt
index 9f99a7bc366f8c7593c5ee3c6938550e0479bdb3..759b5b16ad2c39a55ee85efaa7890cf510514d47 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=provision-0.4-beta2'
+ wget -O install.sh 'http://git.aegirproject.org/?p=provision.git;a=blob_plain;f=install.sh.txt;hb=HEAD'
 
 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 58d988e1fc15b02ea543bf4a92050b412df5f9f8..d4ee037759a55717d9972691bbf42b851b7ebe2f 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=provision-0.4-beta2'
+ wget -O upgrade.sh.txt 'http://git.aegirproject.org/?p=provision.git;a=blob_plain;f=upgrade.sh.txt;hb=HEAD'
 
 You may need to edit the script to set any variables that are different from the
 defaults. Pay particular attention to the OLD_DRUPAL_DIR variable, as you may be
@@ -86,13 +86,13 @@ you are reading this document.
 
 Shell commands::
 
-  export AEGIR_VERSION=0.4-beta2
+  export AEGIR_VERSION=HEAD
   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-beta1
+  export OLD_DRUPAL_DIR=$AEGIR_DIR/hostmaster-0.4-alpha9
 
 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 ea2f045da2a2aaa751f4476624911377a0e9ca22..387637174d200c5f5b00ef054fb631f9452cfa60 100644
--- a/install.sh.txt
+++ b/install.sh.txt
@@ -28,7 +28,7 @@
 ########################################################################
 
 # guess the aegir version based on the info file
-AEGIR_VERSION="0.4-beta2"
+AEGIR_VERSION=HEAD
 DRUSH_VERSION=6.x-3.3
 
 ########################################################################
diff --git a/provision.info b/provision.info
index 93f6f0ca050b884110f9d0342721ad443153688e..0e82ccc5d9d03d7c8616da94f1bf939fdaf08f54 100644
--- a/provision.info
+++ b/provision.info
@@ -1,4 +1,4 @@
 name=Provision
 description="Aegir backend"
 
-version=0.4-beta2
+version=HEAD
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index 65e79ba235d687875b26a01ab23f6b349110cb09..73adbcb51a40645d75bdacd48cf0811e8f681dcd 100644
--- a/upgrade.sh.txt
+++ b/upgrade.sh.txt
@@ -11,7 +11,7 @@
 ########################################################################
 
 # basic variables, change before running
-AEGIR_VERSION="0.4-beta2"
+AEGIR_VERSION=HEAD
 AEGIR_DOMAIN=aegir.example.com
 
 AEGIR_DIR=/var/aegir