diff --git a/HISTORY.rst b/HISTORY.rst
index 4bcb68f6..bfb85fe7 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,12 @@ Release Notes
 PlatformIO 3.0
 --------------
 
+3.5.4 (2018-??-??)
+~~~~~~~~~~~~~~~~~~
+
+* Check maximum allowed firmware size for programming/uploading using `platformio run --target checkprogsize <http://docs.platformio.org/en/latest/userguide/cmd_run.html#cmdoption-platformio-run-t>`__
+  (`issue #1412 <https://github.com/platformio/platformio-core/issues/1412>`_)
+
 3.5.3 (2018-06-01)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/docs b/docs
index 3ad76be8..91eae264 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 3ad76be8f73ab1b3766bafa7ffca4284051aca4c
+Subproject commit 91eae264171d7c7662ba39be5954d9b76f267373