diff --git a/aegir-release.make b/aegir-release.make
index e004c4b774a074536d854a977cca12d5e8570cfb..d7fca9834be4b3bf9e056190773d208b8a83d5b4 100644
--- a/aegir-release.make
+++ b/aegir-release.make
@@ -4,4 +4,4 @@ api = 2
 ; this makefile fetches the latest release from Drupal.org
 ; it is maintained through the release.sh script
 projects[hostmaster][type] = "core"
-projects[hostmaster][version] = "7.x-3.0-dev"
+projects[hostmaster][version] = "7.x-3.1"
diff --git a/aegir.make b/aegir.make
deleted file mode 100644
index d1357cc84ef36ce883a105d1a5d6da21cc190ab1..0000000000000000000000000000000000000000
--- a/aegir.make
+++ /dev/null
@@ -1,10 +0,0 @@
-core = 7.x
-api = 2
-
-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] = "7.x-3.x"
-
diff --git a/aegir.make b/aegir.make
new file mode 120000
index 0000000000000000000000000000000000000000..f6e35b975feae015d21a03f4812e212d0079b010
--- /dev/null
+++ b/aegir.make
@@ -0,0 +1 @@
+aegir-release.make
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 7f046e901834be28794c5c4afae570a4b91959d8..cc12ae36691a2f385339eb1e96f99f955d53181f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+aegir3-provision (3.1) unstable; urgency=medium
+
+  * Second stable release of the 3.x series.
+  * Bufixes and UI improvements, see http://aegir.readthedocs.org/en/3.x/release-notes/3.1-release-notes
+
+ -- Guillaume Boudrias <gboudrias@praxis.coop>  Fri, 21 Aug 2015 11:11:44 -0400
+
 aegir3-provision (3.0.1) unstable; urgency=medium
 
   * Fix a bug in the Debian package that prevented new installations.
diff --git a/provision.info b/provision.info
index 6f0191608fab3199092e85ac1c82308fcadba9a7..cac4d114fda6aa36e617c38d374f47803db7b5d7 100644
--- a/provision.info
+++ b/provision.info
@@ -1,4 +1,4 @@
 name=Provision
 description="Aegir backend"
 
-version=7.x-3.x
+version=7.x-3.1
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index 44dfa82828d40a101126287b0297c3c5fce11e77..10949f6fe7ac25bee5251e4c45665f1a931d4162 100644
--- a/upgrade.sh.txt
+++ b/upgrade.sh.txt
@@ -9,7 +9,7 @@
 ########################################################################
 
 # Basic variables, change before running.
-AEGIR_VERSION="7.x-3.x"
+AEGIR_VERSION="7.x-3.1"
 NEW_DRUSH_VERSION=6.6.0
 
 # Extra variables, no changes needed for most use-cases.