diff --git a/CHANGELOG.md b/CHANGELOG.md
index c866a8dc21..e235086af4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@ Please make sure to always read our [Upgrading](doc/80-Upgrading.md) documentati
 
 ## What's New
 
+### What's New in Version 2.11.1
+
+You can find all issues related to this release on our [Roadmap](https://github.com/Icinga/icingaweb2/milestone/75?closed=1).
+
+This update's main focus is to solve the issue that all history views didn't work correctly or showed invalid
+time and dates. ([#4853](https://github.com/Icinga/icingaweb2/issues/4853))
+
 ### What's New in Version 2.11.0
 
 You can find all issues related to this release on our [Roadmap](https://github.com/Icinga/icingaweb2/milestone/70?closed=1).
diff --git a/VERSION b/VERSION
index b0c3c5ce99..d6509f096f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.11.0
+v2.11.1
diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index 97650659ff..00a33838e5 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -1036,7 +1036,7 @@ public function getConfigTabs()
     public function providesSetupWizard()
     {
         $this->launchConfigScript();
-        if (class_exists($this->setupWizard)) {
+        if ($this->setupWizard && class_exists($this->setupWizard)) {
             $wizard = new $this->setupWizard;
             return $wizard instanceof SetupWizard;
         }
diff --git a/library/Icinga/Application/Version.php b/library/Icinga/Application/Version.php
index f6642a725e..d507c08c47 100644
--- a/library/Icinga/Application/Version.php
+++ b/library/Icinga/Application/Version.php
@@ -8,7 +8,7 @@
  */
 class Version
 {
-    const VERSION = '2.11.0';
+    const VERSION = '2.11.1';
 
     /**
      * Get the version of this instance of Icinga Web 2
diff --git a/modules/doc/module.info b/modules/doc/module.info
index d84ea6061e..07911108dd 100644
--- a/modules/doc/module.info
+++ b/modules/doc/module.info
@@ -1,4 +1,4 @@
 Module: doc
-Version: 2.11.0
+Version: 2.11.1
 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 05ccf8ffd6..43c6152a6f 100644
--- a/modules/migrate/module.info
+++ b/modules/migrate/module.info
@@ -1,5 +1,5 @@
 Module: migrate
-Version: 2.11.0
+Version: 2.11.1
 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 06e04af2d1..f27e0e688b 100644
--- a/modules/monitoring/module.info
+++ b/modules/monitoring/module.info
@@ -1,5 +1,5 @@
 Module: monitoring
-Version: 2.11.0
+Version: 2.11.1
 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 9ba59a3c1a..b82a6a9a70 100644
--- a/modules/setup/module.info
+++ b/modules/setup/module.info
@@ -1,5 +1,5 @@
 Module: setup
-Version: 2.11.0
+Version: 2.11.1
 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 c28d0224e4..7c0762136e 100644
--- a/modules/test/module.info
+++ b/modules/test/module.info
@@ -1,5 +1,5 @@
 Module: test
-Version: 2.11.0
+Version: 2.11.1
 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 8147eb67b6..f2fdb287b1 100644
--- a/modules/translation/module.info
+++ b/modules/translation/module.info
@@ -1,5 +1,5 @@
 Module: translation
-Version: 2.11.0
+Version: 2.11.1
 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.