diff --git a/HISTORY.rst b/HISTORY.rst
index adff885e..6f0b02f1 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,7 +4,7 @@ Release Notes
 PlatformIO 3.0
 --------------
 
-3.6.3 (2018-12-??)
+3.6.3 (2018-12-12)
 ~~~~~~~~~~~~~~~~~~
 
 * Ignore *.asm and *.ASM files when building Arduino-based library (compatibility with Arduino builder)
diff --git a/docs b/docs
index 3161e115..c0dc8357 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 3161e115ec58d566156160319985f264d9082334
+Subproject commit c0dc83570a14489da4e887215b08035a503b9d95
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 231445fc..3f6bf3af 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (3, 6, "3b2")
+VERSION = (3, 6, 3)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"