diff --git a/VERSION b/VERSION
index 05429d987..3f03d9f19 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.8.4
+v2.8.5
diff --git a/library/Icinga/Application/Version.php b/library/Icinga/Application/Version.php
index 448f62fbe..4746e8e43 100644
--- a/library/Icinga/Application/Version.php
+++ b/library/Icinga/Application/Version.php
@@ -8,7 +8,7 @@ namespace Icinga\Application;
  */
 class Version
 {
-    const VERSION = '2.8.4';
+    const VERSION = '2.8.5';
 
     /**
      * Get the version of this instance of Icinga Web 2
diff --git a/modules/doc/module.info b/modules/doc/module.info
index 782bcf957..6e4f4c4cc 100644
--- a/modules/doc/module.info
+++ b/modules/doc/module.info
@@ -1,4 +1,4 @@
 Module: doc
-Version: 2.8.4
+Version: 2.8.5
 Description: Documentation module
  Extracts, shows and exports documentation for Icinga Web 2 and its modules.
diff --git a/modules/migrate/module.info b/modules/migrate/module.info
index ce4911bb8..cf7c8c767 100644
--- a/modules/migrate/module.info
+++ b/modules/migrate/module.info
@@ -1,5 +1,5 @@
 Module: migrate
-Version: 2.8.4
+Version: 2.8.5
 Description: Migrate module
  This module was introduced with the domain-aware authentication feature in version 2.5.0.
  It helps you migrating users and user configurations according to a given domain.
diff --git a/modules/monitoring/module.info b/modules/monitoring/module.info
index 4a1b04142..822ebd3ed 100644
--- a/modules/monitoring/module.info
+++ b/modules/monitoring/module.info
@@ -1,5 +1,5 @@
 Module: monitoring
-Version: 2.8.4
+Version: 2.8.5
 Description: Icinga monitoring module
  IDO accessor and UI for your monitoring. This is the initial instalment for a
  graphical presentation of Icinga environments. The predecessor of Icinga DB.
diff --git a/modules/setup/module.info b/modules/setup/module.info
index 7132483d7..cfc21f345 100644
--- a/modules/setup/module.info
+++ b/modules/setup/module.info
@@ -1,5 +1,5 @@
 Module: setup
-Version: 2.8.4
+Version: 2.8.5
 Description: Setup module
  Web based wizard for setting up Icinga Web 2 and its modules.
  This includes the data backends (e.g. relational database, LDAP),
diff --git a/modules/test/module.info b/modules/test/module.info
index f460f62b7..a265b8238 100644
--- a/modules/test/module.info
+++ b/modules/test/module.info
@@ -1,5 +1,5 @@
 Module: test
-Version: 2.8.4
+Version: 2.8.5
 Description: Translation module
  This module allows developers to run (unit) tests against Icinga Web 2 and
  any of its modules. Usually you do not need to enable this.
diff --git a/modules/translation/module.info b/modules/translation/module.info
index 275fc5117..ca3b75680 100644
--- a/modules/translation/module.info
+++ b/modules/translation/module.info
@@ -1,5 +1,5 @@
 Module: translation
-Version: 2.8.4
+Version: 2.8.5
 Description: Translation module
  This module allows developers and translators to translate Icinga Web 2 and
  its modules for multiple languages. You do not need this module to run an