diff --git a/HISTORY.rst b/HISTORY.rst
index 07738598..efa87c51 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -6,15 +6,15 @@ Release Notes
 PlatformIO 4.0
 --------------
 
-4.0.0 (2019-??-??)
+4.0.0 (2019-07-10)
 ~~~~~~~~~~~~~~~~~~
 
 `Migration Guide from 3.0 to 4.0 <http://docs.platformio.org/page/migration.html>`__.
 
 * `PlatformIO Plus Goes Open Source <https://community.platformio.org/t/platformio-plus-goes-open-source-improving-embedded-development-community-worldwide/8240/4>`__
 
-  - Open source `PIO Unified Debugger <http://docs.platformio.org/page/plus/debugging.html>`__
-  - Open source `PIO Unit Testing <http://docs.platformio.org/page/plus/unit-testing.html>`__
+  - Built-in `PIO Unified Debugger <http://docs.platformio.org/page/plus/debugging.html>`__
+  - Built-in `PIO Unit Testing <http://docs.platformio.org/page/plus/unit-testing.html>`__
 
 * **Project Configuration**
 
diff --git a/docs b/docs
index e4c3ba24..ae7deefa 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit e4c3ba241e17e419a9b8b62706fe08e9a8987590
+Subproject commit ae7deefa584f8c0fbb98c36b45649cc86bdf46b7
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 6e4aee59..9fb531a5 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = (4, 0, "0rc6")
+VERSION = (4, 0, 0)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"