diff --git a/ChangeLog b/ChangeLog
index f0696aaca0..30ed02c2a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
 
 ## What's New
 
+### What's New in Version 2.4.1
+
+Our public repositories and issue tracker have been migrated to GitHub.
+
+#### Bugfixes
+
+* Bug 2651: [dev.icinga.com #13607] Displayed times messed up in Icinga Web 2.4.0 w/ PostgreSQL
+* Bug 2654: [dev.icinga.com #13615] Setup wizard: Not possible to setup Icinga Web 2 with an external database
+* Bug 2663: [dev.icinga.com #13691] Hook::all() is broken on CLI
+* Bug 2669: [dev.icinga.com #13735] Setup wizard: Progress bar isn't shown correctly, if setup is at finish step
+* Bug 2681: [dev.icinga.com #13957] Support failover API command transport configuration
+* Bug 2686: Granular module permissions do not work for hooks
+* Bug 2687: Update URLs to icinga.com, remove wiki & update to GitHub
+
 ### What's New in Version 2.4.0
 
 #### Feature
diff --git a/VERSION b/VERSION
index 8721bbc46a..a372120910 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.4.0
+v2.4.1
diff --git a/doc/02-Installation.md b/doc/02-Installation.md
index 44beedcbdc..55e614370a 100644
--- a/doc/02-Installation.md
+++ b/doc/02-Installation.md
@@ -451,9 +451,9 @@ Finally visit Icinga Web 2 in your browser to login as `icingaadmin` user: `/ici
 
 ## <a id="upgrading"></a> Upgrading Icinga Web 2
 
-### <a id="upgrading-to-2.4.0"></a> Upgrading to Icinga Web 2 2.4.0
+### <a id="upgrading-to-2.4.x"></a> Upgrading to Icinga Web 2 2.4.x
 
-* Icinga Web 2 version 2.4.0 does not introduce any backward incompatible change.
+* Icinga Web 2 version 2.4.x does not introduce any backward incompatible change.
 
 ### <a id="upgrading-to-2.3.x"></a> Upgrading to Icinga Web 2 2.3.x
 
diff --git a/icingaweb2.spec b/icingaweb2.spec
index af2e41cece..fed584f900 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -1,9 +1,9 @@
 # Icinga Web 2 | (c) 2013-2016 Icinga Development Team | GPLv2+
 
-%define revision 2
+%define revision 1
 
 Name:           icingaweb2
-Version:        2.4.0
+Version:        2.4.1
 Release:        %{revision}%{?dist}
 Summary:        Icinga Web 2
 Group:          Applications/System
diff --git a/library/Icinga/Application/Version.php b/library/Icinga/Application/Version.php
index e54abc97b0..8b598cec6d 100644
--- a/library/Icinga/Application/Version.php
+++ b/library/Icinga/Application/Version.php
@@ -8,7 +8,7 @@
  */
 class Version
 {
-    const VERSION = '2.4.0';
+    const VERSION = '2.4.1';
 
     /**
      * Get the version of this instance of Icinga Web 2
diff --git a/modules/doc/module.info b/modules/doc/module.info
index 5acf736a61..e9071aceeb 100644
--- a/modules/doc/module.info
+++ b/modules/doc/module.info
@@ -1,4 +1,4 @@
 Module: doc
-Version: 2.4.0
+Version: 2.4.1
 Description: Documentation module
  Extracts, shows and exports documentation for Icinga Web 2 and its modules.
diff --git a/modules/monitoring/module.info b/modules/monitoring/module.info
index 643af3293f..123f35daa1 100644
--- a/modules/monitoring/module.info
+++ b/modules/monitoring/module.info
@@ -1,5 +1,5 @@
 Module: monitoring
-Version: 2.4.0
+Version: 2.4.1
 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 9c4db99328..a718f39972 100644
--- a/modules/setup/module.info
+++ b/modules/setup/module.info
@@ -1,5 +1,5 @@
 Module: setup
-Version: 2.4.0
+Version: 2.4.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 74d7d39694..b41d25fa65 100644
--- a/modules/test/module.info
+++ b/modules/test/module.info
@@ -1,5 +1,5 @@
 Module: test
-Version: 2.4.0
+Version: 2.4.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 becec95674..3ed7075503 100644
--- a/modules/translation/module.info
+++ b/modules/translation/module.info
@@ -1,5 +1,5 @@
 Module: translation
-Version: 2.4.0
+Version: 2.4.1
 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