diff --git a/HISTORY.rst b/HISTORY.rst
index f62c654e31..0e59a8f511 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,13 @@ Release History
 PlatformIO 2.0
 --------------
 
+2.6.1 (2015-12-??)
+~~~~~~~~~~~~~~~~~~
+
+* Fixed reset method for Espressif NodeMCU (ESP-12E Module)
+  (`issue #380 <https://github.com/platformio/platformio/issues/380>`_)
+
+
 2.6.0 (2015-12-15)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/frameworks/arduino.rst b/docs/frameworks/arduino.rst
index 78d2689523..ec5bb505e6 100644
--- a/docs/frameworks/arduino.rst
+++ b/docs/frameworks/arduino.rst
@@ -363,7 +363,7 @@ BQ
       - RAM
 
     * - ``zumbt328``
-      - `BQ ZUM BT-328 board <http://www.bq.com/gb/products/zum.html>`_
+      - `BQ ZUM BT-328 <http://www.bq.com/gb/products/zum.html>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
@@ -485,21 +485,14 @@ Espressif
       - RAM
 
     * - ``esp01``
-      - `Espressif ESP8266 ESP-01 board <https://nurdspace.nl/ESP8266>`_
+      - `Espressif Generic ESP8266 ESP-01 <https://nurdspace.nl/ESP8266>`_
       - ESP8266
       - 80 MHz
       - 512 Kb
       - 32 Kb
 
-    * - ``esp01_1m``
-      - `Espressif ESP8266 ESP-01-1MB board <https://nurdspace.nl/ESP8266>`_
-      - ESP8266
-      - 80 MHz
-      - 1024 Kb
-      - 32 Kb
-
     * - ``esp12e``
-      - `Espressif ESP8266 ESP-12E board (NodeMCU) <https://nurdspace.nl/ESP8266>`_
+      - `Espressif NodeMCU (ESP-12 Module) <https://nurdspace.nl/ESP8266>`_
       - ESP8266
       - 80 MHz
       - 4096 Kb
diff --git a/docs/platforms/atmelavr.rst b/docs/platforms/atmelavr.rst
index 72f0e34220..5e750445e9 100644
--- a/docs/platforms/atmelavr.rst
+++ b/docs/platforms/atmelavr.rst
@@ -368,7 +368,7 @@ BQ
       - RAM
 
     * - ``zumbt328``
-      - `BQ ZUM BT-328 board <http://www.bq.com/gb/products/zum.html>`_
+      - `BQ ZUM BT-328 <http://www.bq.com/gb/products/zum.html>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
diff --git a/docs/platforms/espressif.rst b/docs/platforms/espressif.rst
index 0f1ee9aff1..e5917268c3 100644
--- a/docs/platforms/espressif.rst
+++ b/docs/platforms/espressif.rst
@@ -86,21 +86,14 @@ Espressif
       - RAM
 
     * - ``esp01``
-      - `Espressif ESP8266 ESP-01 board <https://nurdspace.nl/ESP8266>`_
+      - `Espressif Generic ESP8266 ESP-01 <https://nurdspace.nl/ESP8266>`_
       - ESP8266
       - 80 MHz
       - 512 Kb
       - 32 Kb
 
-    * - ``esp01_1m``
-      - `Espressif ESP8266 ESP-01-1MB board <https://nurdspace.nl/ESP8266>`_
-      - ESP8266
-      - 80 MHz
-      - 1024 Kb
-      - 32 Kb
-
     * - ``esp12e``
-      - `Espressif ESP8266 ESP-12E board (NodeMCU) <https://nurdspace.nl/ESP8266>`_
+      - `Espressif NodeMCU (ESP-12 Module) <https://nurdspace.nl/ESP8266>`_
       - ESP8266
       - 80 MHz
       - 4096 Kb
diff --git a/examples/espressif/esp8266-webserver/platformio.ini b/examples/espressif/esp8266-webserver/platformio.ini
index e79ce81ca3..a6f42f61ce 100644
--- a/examples/espressif/esp8266-webserver/platformio.ini
+++ b/examples/espressif/esp8266-webserver/platformio.ini
@@ -17,7 +17,12 @@
 # Automatic targets - enable auto-uploading
 # targets = upload
 
-[env:esp01_8266]
+[env:esp01]
 platform = espressif
 framework = arduino
 board = esp01
+
+[env:esp12e]
+platform = espressif
+framework = arduino
+board = esp12e
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 784f17154b..e656a7aec8 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, 0)
+VERSION = (2, 6, "1.dev0")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/boards/espressif.json b/platformio/boards/espressif.json
index ea97a27bf9..175f1da0ab 100644
--- a/platformio/boards/espressif.json
+++ b/platformio/boards/espressif.json
@@ -9,40 +9,19 @@
             "variant": "generic"
         },
         "frameworks": ["arduino"],
-        "name": "Espressif ESP8266 ESP-01 board",
+        "name": "Espressif Generic ESP8266 ESP-01",
         "platform": "espressif",
         "upload": {
             "maximum_ram_size": 32768,
             "maximum_size": 524288,
-            "protocol": "arduino",
-            "require_upload_port" : true,
-            "speed": 115200
-        },
-        "url": "https://nurdspace.nl/ESP8266",
-        "vendor": "Espressif"
-    },
-    "esp01_1m": {
-        "build": {
-            "core": "esp8266",
-            "extra_flags": "-DARDUINO_ESP8266_ESP01 -DARDUINO_ARCH_ESP8266 -DESP8266",
-            "f_cpu": "80000000L",
-            "ldscript": "esp8266.flash.1m128.ld",
-            "mcu": "esp8266",
-            "variant": "generic"
-        },
-        "frameworks": ["arduino"],
-        "name": "Espressif ESP8266 ESP-01-1MB board",
-        "platform": "espressif",
-        "upload": {
-            "maximum_ram_size": 32768,
-            "maximum_size": 1048576,
-            "protocol": "arduino",
+            "resetmethod": "ck",
             "require_upload_port" : true,
             "speed": 115200
         },
         "url": "https://nurdspace.nl/ESP8266",
         "vendor": "Espressif"
     },
+
     "esp12e": {
         "build": {
             "core": "esp8266",
@@ -53,12 +32,12 @@
             "variant": "nodemcu"
         },
         "frameworks": ["arduino"],
-        "name": "Espressif ESP8266 ESP-12E board (NodeMCU)",
+        "name": "Espressif NodeMCU (ESP-12 Module)",
         "platform": "espressif",
         "upload": {
             "maximum_ram_size": 32768,
             "maximum_size": 4194304,
-            "protocol": "arduino",
+            "resetmethod": "nodemcu",
             "require_upload_port" : true,
             "speed": 115200
         },
diff --git a/platformio/boards/misc.json b/platformio/boards/misc.json
index a50800103e..fa028efca9 100644
--- a/platformio/boards/misc.json
+++ b/platformio/boards/misc.json
@@ -459,7 +459,7 @@
             "variant": "eightanaloginputs"
         },
         "frameworks": ["arduino"],
-        "name": "BQ ZUM BT-328 board",
+        "name": "BQ ZUM BT-328",
         "platform": "atmelavr",
         "upload": {
             "disable_flushing": true,
diff --git a/platformio/builder/scripts/espressif.py b/platformio/builder/scripts/espressif.py
index 0980c605c6..b4bd4e7350 100644
--- a/platformio/builder/scripts/espressif.py
+++ b/platformio/builder/scripts/espressif.py
@@ -87,7 +87,7 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
     UPLOADER=join("$PIOPACKAGES_DIR", "tool-esptool", "esptool"),
     UPLOADERFLAGS=[
         "-vv",
-        "-cd", "ck",
+        "-cd", "${BOARD_OPTIONS['upload']['resetmethod']}",
         "-cb", "$UPLOAD_SPEED",
         "-cp", "$UPLOAD_PORT",
         "-ca", "0x00000",