diff --git a/HISTORY.rst b/HISTORY.rst
index f0e541db..9e5bff4e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -8,14 +8,16 @@ PlatformIO Core 5
 
 **A professional collaborative platform for embedded development**
 
-5.0.4 (2020-??-??)
+5.0.4 (2020-12-30)
 ~~~~~~~~~~~~~~~~~~
 
 - Added "Core" suffix when showing PlatformIO Core version using ``pio --version`` command
 - Improved ``.ccls`` configuration file for Emacs, Vim, and Sublime Text integrations
 - Updated analysis tools:
+
     * `Cppcheck <https://docs.platformio.org/page/plus/check-tools/cppcheck.html>`__ v2.3 with improved C++ parser and several new MISRA rules
     * `PVS-Studio <https://docs.platformio.org/page/plus/check-tools/pvs-studio.html>`__ v7.11 with new diagnostics and updated mass suppression mechanism
+
 - Show a warning message about deprecated support for Python 2 and Python 3.5
 - Do not provide "intelliSenseMode" option when generating configuration for VSCode C/C++ extension
 - Fixed a "git-sh-setup: file not found" error when installing project dependencies from Git VCS (`issue #3740 <https://github.com/platformio/platformio-core/issues/3740>`_)
diff --git a/docs b/docs
index 639e6b27..9db46dcc 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 639e6b27b84f1592fdd579b65f49aac9eafd1628
+Subproject commit 9db46dccef0a765770e71b64bf29b6e1d91df403
diff --git a/platformio/__init__.py b/platformio/__init__.py
index d3fba312..a540b3ff 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (5, 0, "4rc1")
+VERSION = (5, 0, 4)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"