diff --git a/HISTORY.rst b/HISTORY.rst
index f960d9c8..44821cb2 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -11,7 +11,7 @@ PlatformIO Core 6
 
 **A professional collaborative platform for declarative, safety-critical, and test-driven embedded development.**
 
-6.0.0 (2022-??-??)
+6.0.0 (2022-05-16)
 ~~~~~~~~~~~~~~~~~~
 
 Please check the `Migration guide from 5.x to 6.0 <https://docs.platformio.org/en/latest/core/migration.html>`__.
diff --git a/docs b/docs
index 4892c242..6bbb8134 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 4892c2422662cb0fb599a5acde88310066cbbae3
+Subproject commit 6bbb813494d4a28bf6345a478b41c8f92e0b2533
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 0e1fd56b..f59130aa 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (6, 0, "0rc3")
+VERSION = (6, 0, 0)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"