diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 14c9871e..b270fb28 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,8 +1,8 @@
 Changelog
 =========
 
-not yet released
-----------------
+v3.1.0 (released August 7, 2014)
+--------------------------------
 
 Features:
 
@@ -35,7 +35,7 @@ Bugs:
 * Composer added for dependencies.
 
 v3.0.1 (released April 12, 2014)
-----------------
+--------------------------------
 
 * #56: Minimum PHP version is PHP 5.3.7 (not PHP 5.3.0).
 * #58: Server order on users page now matches the order on servers page.
diff --git a/README.rst b/README.rst
index a84a1548..e57bdc11 100755
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 PHP Server Monitor
 ==================
 
-Version 3.1.0-dev
+Version 3.1.0
 
 PHP Server Monitor is a script that checks whether your websites and servers are up and running.
 It comes with a web based user interface where you can manage your services and websites,
diff --git a/docs/conf.py b/docs/conf.py
index 12f0b996..3ab40df6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,7 +51,7 @@ copyright = u'2008-2014, Pepijn Over'
 # built documents.
 #
 # The short X.Y version.
-version = '3.1.0-dev'
+version = '3.1.0'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/src/includes/psmconfig.inc.php b/src/includes/psmconfig.inc.php
index 3cc604dd..9876bc88 100644
--- a/src/includes/psmconfig.inc.php
+++ b/src/includes/psmconfig.inc.php
@@ -29,7 +29,7 @@
 /**
  * Current PSM version
  */
-define('PSM_VERSION', '3.1.0-dev');
+define('PSM_VERSION', '3.1.0');
 
 /**
  * URL to check for updates. Will not be checked if turned off on config page.