diff --git a/ChangeLog b/ChangeLog
index 21989e5649..f4b01c1af9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,13 @@
 phpMyAdmin - ChangeLog
 ======================
 
-5.0.4 (not yet released)
+5.0.4 (2020-10-15)
 - issue #16245 Fix failed Zoom search clears existing values
 - issue        Fixed a PHP error when reporting a particular JS error
 - issue #16326 Fixed latitude and longitude swap for geometries in edit mode
 - issue #16032 Fix CREATE TABLE not being tracked when auto tracking is enabled
+- issue #16397 Fix compatibility problems with older PHP versions (also issue #16399)
+- issue #16396 Fix broken two-factor authentication
 
 5.0.3 (2020-10-09)
 - issue #15983 Require twig ^2.9
diff --git a/README b/README
index 5ec83d2467..3a5dfe9b3d 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 5.0.4-dev
+Version 5.0.4
 
 A web interface for MySQL and MariaDB.
 
diff --git a/doc/conf.py b/doc/conf.py
index fde3f02d8b..cd4b120e27 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -51,7 +51,7 @@ copyright = u'2012 - 2020, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '5.0.4-dev'
+version = '5.0.4'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
index 6f19a1c2a3..3ea34f0065 100644
--- a/libraries/classes/Config.php
+++ b/libraries/classes/Config.php
@@ -113,7 +113,7 @@ class Config
      */
     public function checkSystem(): void
     {
-        $this->set('PMA_VERSION', '5.0.4-dev');
+        $this->set('PMA_VERSION', '5.0.4');
         /* Major version */
         $this->set(
             'PMA_MAJOR_VERSION',
diff --git a/package.json b/package.json
index 8b612ea01d..4cd61de930 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "phpmyadmin",
-  "version": "5.0.4-dev",
+  "version": "5.0.4",
   "description": "A web interface for MySQL and MariaDB",
   "repository": "https://github.com/phpmyadmin/phpmyadmin.git",
   "author": "The phpMyAdmin Team <developers@phpmyadmin.net> (https://www.phpmyadmin.net/team/)",