diff --git a/aegir.make b/aegir.make
index f0a70a35c3340686825ea3d353bd8a01581badf0..ce5454f47ce8b145ca5084c2fb395cd0360e69d2 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-2.x"
+projects[hostmaster][download][tag] = "6.x-2.0-alpha2"
diff --git a/debian/changelog b/debian/changelog
index 62a657312adc74edd2d3a17906abb84b6a6e1177..fdd6c8e2f6d4afd9533300185614036ec3e9e986 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,19 @@
 aegir-provision2 (2.0~alpha2) unstable; urgency=low
 
-  * test release scripts
-
- -- Antoine Beaupré <anarcat@debian.org>  Thu, 16 May 2013 17:58:07 -0400
+  * This release features improvements to the IP management mechanisms that
+    were broken in the last alpha1 release. We now manage IP addresses
+    individually, and check if an IP is in use before allowing it to be
+    deleted.
+
+  * We also finally leave the files alone on spokes in the multi-server
+    model, a long-standing bug in the 1.x series that led to data loss. A
+    lot of work was done to standardize the Nginx configuration to allow
+    for simpler, yet optional, configurations that leave the admin in
+    charge of choosing the optimisation methods. This is still work in
+    progress, tracked in #1635596: nginx: do not decide the policy for
+    users.
+
+ -- Antoine Beaupré <anarcat@debian.org>  Thu, 16 May 2013 19:13:17 -0400
 
 aegir-provision2 (2.0~alpha1) unstable; urgency=low
 
diff --git a/provision.info b/provision.info
index a956a2991cc99d8663849f612cc79b4249a81200..4522b36551faf632a7d48d394ad17b57255858d4 100644
--- a/provision.info
+++ b/provision.info
@@ -1,4 +1,4 @@
 name=Provision
 description="Aegir backend"
 
-version=6.x-2.x
+version=6.x-2.0-alpha2
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index e4ca2607ad0ce561976c642b8ca588e0069dadf8..48e059cea3688a850855c505637bccabdf066205 100644
--- a/upgrade.sh.txt
+++ b/upgrade.sh.txt
@@ -15,7 +15,7 @@ msg() {
 }
 
 # basic variables, change before running
-AEGIR_VERSION="6.x-2.x"
+AEGIR_VERSION="6.x-2.0-alpha2"
 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