diff --git a/HISTORY.rst b/HISTORY.rst
index 64cd9797..d01b2067 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,12 @@ Release History
 PlatformIO 2.0
 --------------
 
+2.6.3 (2015-12-??)
+~~~~~~~~~~~~~~~~~~
+
+* Fixed invalid ROM size for ESP8266-based boards
+  (`issue #396 <https://github.com/platformio/platformio/issues/396>`_)
+
 2.6.2 (2015-12-21)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 235dd071..9dee1400 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 = (2, 6, 2)
+VERSION = (2, 6, "3.dev0")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/boards/espressif.json b/platformio/boards/espressif.json
index 53cffe70..51614a80 100644
--- a/platformio/boards/espressif.json
+++ b/platformio/boards/espressif.json
@@ -36,7 +36,7 @@
         "platform": "espressif",
         "upload": {
             "maximum_ram_size": 81920,
-            "maximum_size": 1048576,
+            "maximum_size": 4194304,
             "resetmethod": "nodemcu",
             "require_upload_port" : true,
             "speed": 115200
@@ -59,7 +59,7 @@
         "platform": "espressif",
         "upload": {
             "maximum_ram_size": 81920,
-            "maximum_size": 1048576,
+            "maximum_size": 4194304,
             "resetmethod": "nodemcu",
             "require_upload_port" : true,
             "speed": 115200
@@ -82,7 +82,7 @@
         "platform": "espressif",
         "upload": {
             "maximum_ram_size": 81920,
-            "maximum_size": 1048576,
+            "maximum_size": 4194304,
             "resetmethod": "nodemcu",
             "require_upload_port" : true,
             "speed": 115200
@@ -105,7 +105,7 @@
         "platform": "espressif",
         "upload": {
             "maximum_ram_size": 81920,
-            "maximum_size": 1048576,
+            "maximum_size": 2097152,
             "resetmethod": "ck",
             "require_upload_port" : true,
             "speed": 115200
@@ -151,7 +151,7 @@
         "platform": "espressif",
         "upload": {
             "maximum_ram_size": 81920,
-            "maximum_size": 1048576,
+            "maximum_size": 4194304,
             "resetmethod": "ck",
             "require_upload_port" : true,
             "speed": 115200
@@ -174,7 +174,7 @@
         "platform": "espressif",
         "upload": {
             "maximum_ram_size": 81920,
-            "maximum_size": 1048576,
+            "maximum_size": 4194304,
             "resetmethod": "nodemcu",
             "require_upload_port" : true,
             "speed": 460800
@@ -197,7 +197,7 @@
         "platform": "espressif",
         "upload": {
             "maximum_ram_size": 81920,
-            "maximum_size": 1048576,
+            "maximum_size": 4194304,
             "resetmethod": "nodemcu",
             "require_upload_port" : true,
             "speed": 460800
@@ -220,7 +220,7 @@
         "platform": "espressif",
         "upload": {
             "maximum_ram_size": 81920,
-            "maximum_size": 1048576,
+            "maximum_size": 4194304,
             "resetmethod": "ck",
             "require_upload_port" : true,
             "speed": 115200