diff --git a/AUTHORS b/AUTHORS
index 6e7fa97e1..b880d6abc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -130,6 +130,7 @@ Sylph Lin <sylph.lin@gmail.com>
 tfylling <torbfylling@gmail.com>
 Thomas Gelf <thomas.gelf@icinga.com>
 Tim Helfensdörfer <tim@visualappeal.de>
+Timm Ortloff <timm.ortloff@icinga.com>
 Tobias von der Krone <tobias.vonderkrone@profitbricks.com>
 Tomas Barton <barton.tomas@gmail.com>
 Tom Ford <exptom@users.noreply.github.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4060dd191..1c1a26791 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,16 @@ Please make sure to always read our [Upgrading](doc/80-Upgrading.md) documentati
 
 ## What's New
 
+### What's New in Version 2.11.4
+
+You can find all issues related to this release on our [Roadmap](https://github.com/Icinga/icingaweb2/milestone/78?closed=1).
+
+#### Notable Fixes
+
+* Add/Edit dashlet not possible [#4970](https://github.com/Icinga/icingaweb2/issues/4970)
+* Custom library path + custom library, without slash in its name, results in exception [#4971](https://github.com/Icinga/icingaweb2/issues/4971)
+* Reflected XSS vulnerability in User Backends config page [#4979](https://github.com/Icinga/icingaweb2/issues/4979)
+
 ### What's New in Version 2.11.3
 
 **Notice**: This is a security release. It is recommended to upgrade immediately.
diff --git a/VERSION b/VERSION
index fb2567180..a63479186 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.11.3
+v2.11.4
diff --git a/library/Icinga/Application/Version.php b/library/Icinga/Application/Version.php
index e617f906e..3045e8ce6 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.11.3';
+    const VERSION = '2.11.4';
 
     /**
      * Get the version of this instance of Icinga Web 2
diff --git a/modules/doc/module.info b/modules/doc/module.info
index 0a59980e1..ac596db92 100644
--- a/modules/doc/module.info
+++ b/modules/doc/module.info
@@ -1,4 +1,4 @@
 Module: doc
-Version: 2.11.3
+Version: 2.11.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 9c2040e13..6eb291159 100644
--- a/modules/migrate/module.info
+++ b/modules/migrate/module.info
@@ -1,5 +1,5 @@
 Module: migrate
-Version: 2.11.3
+Version: 2.11.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 e87884c1e..82c520dc9 100644
--- a/modules/monitoring/module.info
+++ b/modules/monitoring/module.info
@@ -1,5 +1,5 @@
 Module: monitoring
-Version: 2.11.3
+Version: 2.11.4
 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 00bade40e..e3570bd04 100644
--- a/modules/setup/module.info
+++ b/modules/setup/module.info
@@ -1,5 +1,5 @@
 Module: setup
-Version: 2.11.3
+Version: 2.11.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 4c6b1113e..df5bb6981 100644
--- a/modules/test/module.info
+++ b/modules/test/module.info
@@ -1,5 +1,5 @@
 Module: test
-Version: 2.11.3
+Version: 2.11.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 24ccb125c..57a0dd27f 100644
--- a/modules/translation/module.info
+++ b/modules/translation/module.info
@@ -1,5 +1,5 @@
 Module: translation
-Version: 2.11.3
+Version: 2.11.4
 Description: Translation module
  This module allows developers and translators to translate modules for multiple
  languages. You do not need this module to run an internationalized web frontend.