diff --git a/aegir.make b/aegir.make
index c98843487bf6b14b470feb6d0bc856256cd7665f..184bb807b27d24c80c3d4eb2a534b6f7775582f8 100644
--- a/aegir.make
+++ b/aegir.make
@@ -6,4 +6,4 @@ projects[drupal][type] = "core"
 projects[hostmaster][type] = "profile"
 projects[hostmaster][download][type] = "git"
 projects[hostmaster][download][url] = "http://git.drupal.org/project/hostmaster.git"
-projects[hostmaster][download][branch] = "6.x-1.x"
+projects[hostmaster][download][tag] = "6.x-1.8"
diff --git a/debian/changelog b/debian/changelog
index 87b71d389ae8378a82f9ebadce6c335c80f80076..cc95f89f9852cdafbe32245f1b753db650436c44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+aegir-provision (1.8) testing; urgency=low
+
+  * new release: various bugfixes to regressions introduced in 1.7, a few
+    general bug fixes and lots of Nginx fixes.
+
+ -- Steven Jones <steven.jones@computerminds.co.uk>  Wed, 18 Apr 2012 09:34:44 +0100
+
 aegir-provision (1.7) testing; urgency=low
 
   * new release: various bugfixes that have accumulated in the issue queue
diff --git a/provision.info b/provision.info
index 43567aa49b14e8acb290edc2d178c9a9608ea1ce..6e71d91ad4ab05c14de9cf7716152dde32304aec 100644
--- a/provision.info
+++ b/provision.info
@@ -1,4 +1,4 @@
 name=Provision
 description="Aegir backend"
 
-version=6.x-1.x
+version=6.x-1.8
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index afa25d2cb93466a579ab5c42380e8991fe69c1bf..e38c8864cc6d968ff65bf1f2171fb39193b8eb57 100644
--- a/upgrade.sh.txt
+++ b/upgrade.sh.txt
@@ -15,7 +15,7 @@ msg() {
 }
 
 # basic variables, change before running
-AEGIR_VERSION="6.x-1.x"
+AEGIR_VERSION="6.x-1.8"
 DRUSH_DIR=$HOME/drush
 DRUSH=$DRUSH_DIR/drush.php
 if which drush 2> /dev/null > /dev/null && which drush | grep -v 'no drush in' > /dev/null; then