diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2fac5e0a7..40f307e36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ Please make sure to always read our [Upgrading](doc/80-Upgrading.md) documentati
 
 ## What's New
 
+### What's New in Version 2.8.4
+
+This release only contains a single fix for flattened custom variables. [#4439](https://github.com/Icinga/icingaweb2/issues/4439)
+
 ### What's New in Version 2.8.3
 
 **Notice**: This is a security release. It is recommended to upgrade to this release if you don't plan to upgrade to v2.9.0.
diff --git a/VERSION b/VERSION
index 37bf03162..05429d987 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.8.3
+v2.8.4
diff --git a/library/Icinga/Application/Version.php b/library/Icinga/Application/Version.php
index 19dfe7389..448f62fbe 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.3';
+    const VERSION = '2.8.4';
 
     /**
      * Get the version of this instance of Icinga Web 2
diff --git a/modules/doc/module.info b/modules/doc/module.info
index 97251612d..782bcf957 100644
--- a/modules/doc/module.info
+++ b/modules/doc/module.info
@@ -1,4 +1,4 @@
 Module: doc
-Version: 2.8.3
+Version: 2.8.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 72e17023a..ce4911bb8 100644
--- a/modules/migrate/module.info
+++ b/modules/migrate/module.info
@@ -1,5 +1,5 @@
 Module: migrate
-Version: 2.8.3
+Version: 2.8.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 58d0049ef..4a1b04142 100644
--- a/modules/monitoring/module.info
+++ b/modules/monitoring/module.info
@@ -1,5 +1,5 @@
 Module: monitoring
-Version: 2.8.3
+Version: 2.8.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 fcdd08c43..7132483d7 100644
--- a/modules/setup/module.info
+++ b/modules/setup/module.info
@@ -1,5 +1,5 @@
 Module: setup
-Version: 2.8.3
+Version: 2.8.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 99cdbda40..f460f62b7 100644
--- a/modules/test/module.info
+++ b/modules/test/module.info
@@ -1,5 +1,5 @@
 Module: test
-Version: 2.8.3
+Version: 2.8.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 432a26d6d..275fc5117 100644
--- a/modules/translation/module.info
+++ b/modules/translation/module.info
@@ -1,5 +1,5 @@
 Module: translation
-Version: 2.8.3
+Version: 2.8.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