diff --git a/VERSION b/VERSION
index ee6b06f026..de6b52b203 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.6.3
+v2.6.4
diff --git a/library/Icinga/Application/Version.php b/library/Icinga/Application/Version.php
index a8c6e82fa8..40fbd11f1a 100644
--- a/library/Icinga/Application/Version.php
+++ b/library/Icinga/Application/Version.php
@@ -8,7 +8,7 @@
  */
 class Version
 {
-    const VERSION = '2.6.3';
+    const VERSION = '2.6.4';
 
     /**
      * Get the version of this instance of Icinga Web 2
diff --git a/modules/doc/module.info b/modules/doc/module.info
index a4e6f4b7f6..f70384e758 100644
--- a/modules/doc/module.info
+++ b/modules/doc/module.info
@@ -1,4 +1,4 @@
 Module: doc
-Version: 2.6.3
+Version: 2.6.4
 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 45699cce2e..78f20af09d 100644
--- a/modules/migrate/module.info
+++ b/modules/migrate/module.info
@@ -1,5 +1,5 @@
 Module: migrate
-Version: 2.6.3
+Version: 2.6.4
 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 b548d2f0e6..765b74bc0b 100644
--- a/modules/monitoring/module.info
+++ b/modules/monitoring/module.info
@@ -1,5 +1,5 @@
 Module: monitoring
-Version: 2.6.3
+Version: 2.6.4
 Description: Icinga monitoring module
  This is the core module for most Icingaweb users. It provides an
  abstraction layer for various Icinga data backends.
diff --git a/modules/setup/module.info b/modules/setup/module.info
index b5a5231a54..42e19a6b51 100644
--- a/modules/setup/module.info
+++ b/modules/setup/module.info
@@ -1,5 +1,5 @@
 Module: setup
-Version: 2.6.3
+Version: 2.6.4
 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 ed51e87cad..8f4ff6bff1 100644
--- a/modules/test/module.info
+++ b/modules/test/module.info
@@ -1,5 +1,5 @@
 Module: test
-Version: 2.6.3
+Version: 2.6.4
 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 9646fd4a4f..e2d52ac3cc 100644
--- a/modules/translation/module.info
+++ b/modules/translation/module.info
@@ -1,5 +1,5 @@
 Module: translation
-Version: 2.6.3
+Version: 2.6.4
 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