diff --git a/HISTORY.rst b/HISTORY.rst
index 6e2cde6d..39ce1ab7 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,7 +4,7 @@ Release Notes
 PlatformIO 3.0
 --------------
 
-3.6.0 (2018-??-??)
+3.6.0 (2018-08-06)
 ~~~~~~~~~~~~~~~~~~
 
 * `Program Memory Usage <http://docs.platformio.org/en/latest/faq.html#program-memory-usage>`_
@@ -15,22 +15,18 @@ PlatformIO 3.0
   - Check maximum allowed "program" and "data" sizes before uploading/programming
     (`issue #1412 <https://github.com/platformio/platformio-core/issues/1412>`_)
 
-* Check package structure after unpacking and raise error when antivirus tool
-  blocks PlatformIO package manager
-  (`issue #1462 <https://github.com/platformio/platformio-core/issues/1462>`_)
-* Lock interprocess requests to PlatformIO Package Manager for
-  install/uninstall operations
-  (`issue #1594 <https://github.com/platformio/platformio-core/issues/1594>`_)
-
-3.5.5 (2018-??-??)
-~~~~~~~~~~~~~~~~~~
-
 * `PIO Unit Testing <http://docs.platformio.org/page/plus/unit-testing.html>`__:
 
   - Documented `Project Shared Code <http://docs.platformio.org/page/plus/unit-testing.html#shared-code>`__
   - Force building of project source code using `test_build_project_src <http://docs.platformio.org/page/projectconf/section_env_test.html#test_build_project_src>`__ option
   - Fixed missed ``UNIT_TEST`` macro for unit test components/libraries
 
+* Check package structure after unpacking and raise error when antivirus tool
+  blocks PlatformIO package manager
+  (`issue #1462 <https://github.com/platformio/platformio-core/issues/1462>`_)
+* Lock interprocess requests to PlatformIO Package Manager for
+  install/uninstall operations
+  (`issue #1594 <https://github.com/platformio/platformio-core/issues/1594>`_)
 * Fixed an issue with `PIO Remote <http://docs.platformio.org/page/plus/pio-remote.html>`__
   when upload process depends on the source code of a project framework
 * Fixed an issue when ``srcFilter`` field in `library.json <http://docs.platformio.org/page/librarymanager/config.html>`__
diff --git a/docs b/docs
index 05a4f485..21c1cf52 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 05a4f485243dba712a2d7a56fd551cbbd0bf79e2
+Subproject commit 21c1cf522ce5e1cf7c04914ba7dbaf33c8cf463d
diff --git a/platformio/__init__.py b/platformio/__init__.py
index c7f83f1e..f86af5f0 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (3, 6, "0rc1")
+VERSION = (3, 6, 0)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"