diff --git a/HISTORY.rst b/HISTORY.rst
index f8353cc7..8f972019 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,6 +7,11 @@ PlatformIO 2.0
 2.6.1 (2015-12-??)
 ~~~~~~~~~~~~~~~~~~
 
+* Added support for the new ESP8266-based boards (SparkFun ESP8266 Thing,
+  NodeMCU 0.9 & 1.0, Olimex MOD-WIFI-ESP8266(-DEV), Adafruit HUZZAH ESP8266,
+  ESPino, SweetPea ESP-210, WeMos D1, WeMos D1 mini) to
+  `Espressif <http://docs.platformio.org/en/latest/platforms/espressif.html>`__
+  development platform
 * Created public `platformio-pkg-ldscripts <https://github.com/platformio/platformio-pkg-ldscripts.git>`_
   repository for LD scripts. Moved common configuration for ESP8266 MCU to
   ``esp8266.flash.common.ld``
diff --git a/docs/frameworks/arduino.rst b/docs/frameworks/arduino.rst
index ec5bb505..7835d441 100644
--- a/docs/frameworks/arduino.rst
+++ b/docs/frameworks/arduino.rst
@@ -484,19 +484,75 @@ Espressif
       - Flash
       - RAM
 
+    * - ``d1``
+      - `WeMos D1 <http://www.wemos.cc/wiki/doku.php?id=en:d1>`_
+      - ESP8266
+      - 80 MHz
+      - 1024 Kb
+      - 80 Kb
+
+    * - ``d1_mini``
+      - `WeMos D1 mini <http://www.wemos.cc/wiki/doku.php?id=en:d1_mini>`_
+      - ESP8266
+      - 80 MHz
+      - 1024 Kb
+      - 80 Kb
+
     * - ``esp01``
       - `Espressif Generic ESP8266 ESP-01 <https://nurdspace.nl/ESP8266>`_
       - ESP8266
       - 80 MHz
       - 512 Kb
-      - 32 Kb
+      - 80 Kb
 
     * - ``esp12e``
-      - `Espressif NodeMCU (ESP-12 Module) <https://nurdspace.nl/ESP8266>`_
+      - `Espressif ESP8266 ESP-12E <https://nurdspace.nl/ESP8266>`_
       - ESP8266
       - 80 MHz
-      - 4096 Kb
-      - 32 Kb
+      - 1024 Kb
+      - 80 Kb
+
+    * - ``esp210``
+      - `SweetPea ESP-210 <http://wiki.sweetpeas.se/index.php?title=ESP-210>`_
+      - ESP8266
+      - 80 MHz
+      - 1024 Kb
+      - 80 Kb
+
+    * - ``espino``
+      - `ESPino <http://www.espino.io>`_
+      - ESP8266
+      - 80 MHz
+      - 1024 Kb
+      - 80 Kb
+
+    * - ``huzzah``
+      - `Adafruit HUZZAH ESP8266 <https://www.adafruit.com/products/2471>`_
+      - ESP8266
+      - 80 MHz
+      - 1024 Kb
+      - 80 Kb
+
+    * - ``modwifi``
+      - `Olimex MOD-WIFI-ESP8266(-DEV) <https://www.olimex.com/Products/IoT/MOD-WIFI-ESP8266-DEV/open-source-hardware>`_
+      - ESP8266
+      - 80 MHz
+      - 1024 Kb
+      - 80 Kb
+
+    * - ``nodemcu``
+      - `NodeMCU 0.9 & 1.0 <http://www.nodemcu.com/>`_
+      - ESP8266
+      - 80 MHz
+      - 1024 Kb
+      - 80 Kb
+
+    * - ``thing``
+      - `SparkFun ESP8266 Thing <https://www.sparkfun.com/products/13231>`_
+      - ESP8266
+      - 80 MHz
+      - 512 Kb
+      - 80 Kb
 
 LightUp
 ~~~~~~~
diff --git a/docs/platforms/espressif.rst b/docs/platforms/espressif.rst
index e5917268..48ca35b7 100644
--- a/docs/platforms/espressif.rst
+++ b/docs/platforms/espressif.rst
@@ -85,16 +85,72 @@ Espressif
       - Flash
       - RAM
 
+    * - ``d1``
+      - `WeMos D1 <http://www.wemos.cc/wiki/doku.php?id=en:d1>`_
+      - ESP8266
+      - 80 MHz
+      - 1024 Kb
+      - 80 Kb
+
+    * - ``d1_mini``
+      - `WeMos D1 mini <http://www.wemos.cc/wiki/doku.php?id=en:d1_mini>`_
+      - ESP8266
+      - 80 MHz
+      - 1024 Kb
+      - 80 Kb
+
     * - ``esp01``
       - `Espressif Generic ESP8266 ESP-01 <https://nurdspace.nl/ESP8266>`_
       - ESP8266
       - 80 MHz
       - 512 Kb
-      - 32 Kb
+      - 80 Kb
 
     * - ``esp12e``
-      - `Espressif NodeMCU (ESP-12 Module) <https://nurdspace.nl/ESP8266>`_
+      - `Espressif ESP8266 ESP-12E <https://nurdspace.nl/ESP8266>`_
       - ESP8266
       - 80 MHz
-      - 4096 Kb
-      - 32 Kb
+      - 1024 Kb
+      - 80 Kb
+
+    * - ``esp210``
+      - `SweetPea ESP-210 <http://wiki.sweetpeas.se/index.php?title=ESP-210>`_
+      - ESP8266
+      - 80 MHz
+      - 1024 Kb
+      - 80 Kb
+
+    * - ``espino``
+      - `ESPino <http://www.espino.io>`_
+      - ESP8266
+      - 80 MHz
+      - 1024 Kb
+      - 80 Kb
+
+    * - ``huzzah``
+      - `Adafruit HUZZAH ESP8266 <https://www.adafruit.com/products/2471>`_
+      - ESP8266
+      - 80 MHz
+      - 1024 Kb
+      - 80 Kb
+
+    * - ``modwifi``
+      - `Olimex MOD-WIFI-ESP8266(-DEV) <https://www.olimex.com/Products/IoT/MOD-WIFI-ESP8266-DEV/open-source-hardware>`_
+      - ESP8266
+      - 80 MHz
+      - 1024 Kb
+      - 80 Kb
+
+    * - ``nodemcu``
+      - `NodeMCU 0.9 & 1.0 <http://www.nodemcu.com/>`_
+      - ESP8266
+      - 80 MHz
+      - 1024 Kb
+      - 80 Kb
+
+    * - ``thing``
+      - `SparkFun ESP8266 Thing <https://www.sparkfun.com/products/13231>`_
+      - ESP8266
+      - 80 MHz
+      - 512 Kb
+      - 80 Kb
diff --git a/examples/espressif/esp8266-webserver/platformio.ini b/examples/espressif/esp8266-webserver/platformio.ini
index a6f42f61..e25bd946 100644
--- a/examples/espressif/esp8266-webserver/platformio.ini
+++ b/examples/espressif/esp8266-webserver/platformio.ini
@@ -22,7 +22,17 @@ platform = espressif
 framework = arduino
 board = esp01
 
-[env:esp12e]
+[env:nodemcu]
 platform = espressif
 framework = arduino
-board = esp12e
+board = nodemcu
+
+[env:huzzah]
+platform = espressif
+framework = arduino
+board = huzzah
+
+[env:thing]
+platform = espressif
+framework = arduino
+board = thing
diff --git a/platformio/__init__.py b/platformio/__init__.py
index c70391a7..fdcf1b1e 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, "1.dev1")
+VERSION = (2, 6, "1.dev2")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/boards/espressif.json b/platformio/boards/espressif.json
index 175f1da0..b11e7c34 100644
--- a/platformio/boards/espressif.json
+++ b/platformio/boards/espressif.json
@@ -2,9 +2,9 @@
     "esp01": {
         "build": {
             "core": "esp8266",
-            "extra_flags": "-DARDUINO_ESP8266_ESP01 -DARDUINO_ARCH_ESP8266 -DESP8266",
+            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01",
             "f_cpu": "80000000L",
-            "ldscript": "esp8266.flash.512k.ld",
+            "ldscript": "esp8266.flash.512k64.ld",
             "mcu": "esp8266",
             "variant": "generic"
         },
@@ -12,7 +12,7 @@
         "name": "Espressif Generic ESP8266 ESP-01",
         "platform": "espressif",
         "upload": {
-            "maximum_ram_size": 32768,
+            "maximum_ram_size": 81920,
             "maximum_size": 524288,
             "resetmethod": "ck",
             "require_upload_port" : true,
@@ -25,23 +25,207 @@
     "esp12e": {
         "build": {
             "core": "esp8266",
-            "extra_flags": "-DARDUINO_ESP8266_ESP12 -DARDUINO_ARCH_ESP8266 -DESP8266",
+            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP12",
             "f_cpu": "80000000L",
             "ldscript": "esp8266.flash.4m.ld",
             "mcu": "esp8266",
             "variant": "nodemcu"
         },
         "frameworks": ["arduino"],
-        "name": "Espressif NodeMCU (ESP-12 Module)",
+        "name": "Espressif ESP8266 ESP-12E",
         "platform": "espressif",
         "upload": {
-            "maximum_ram_size": 32768,
-            "maximum_size": 4194304,
+            "maximum_ram_size": 81920,
+            "maximum_size": 1048576,
             "resetmethod": "nodemcu",
             "require_upload_port" : true,
             "speed": 115200
         },
         "url": "https://nurdspace.nl/ESP8266",
         "vendor": "Espressif"
+    },
+
+    "nodemcu": {
+        "build": {
+            "core": "esp8266",
+            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP12",
+            "f_cpu": "80000000L",
+            "ldscript": "esp8266.flash.4m.ld",
+            "mcu": "esp8266",
+            "variant": "nodemcu"
+        },
+        "frameworks": ["arduino"],
+        "name": "NodeMCU 0.9 & 1.0",
+        "platform": "espressif",
+        "upload": {
+            "maximum_ram_size": 81920,
+            "maximum_size": 1048576,
+            "resetmethod": "nodemcu",
+            "require_upload_port" : true,
+            "speed": 115200
+        },
+        "url": "http://www.nodemcu.com/",
+        "vendor": "Espressif"
+    },
+
+    "huzzah": {
+        "build": {
+            "core": "esp8266",
+            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP12",
+            "f_cpu": "80000000L",
+            "ldscript": "esp8266.flash.4m.ld",
+            "mcu": "esp8266",
+            "variant": "adafruit"
+        },
+        "frameworks": ["arduino"],
+        "name": "Adafruit HUZZAH ESP8266",
+        "platform": "espressif",
+        "upload": {
+            "maximum_ram_size": 81920,
+            "maximum_size": 1048576,
+            "resetmethod": "nodemcu",
+            "require_upload_port" : true,
+            "speed": 115200
+        },
+        "url": "https://www.adafruit.com/products/2471",
+        "vendor": "Espressif"
+    },
+
+    "modwifi": {
+        "build": {
+            "core": "esp8266",
+            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_MOD_WIFI_ESP8266",
+            "f_cpu": "80000000L",
+            "ldscript": "esp8266.flash.2m.ld",
+            "mcu": "esp8266",
+            "variant": "generic"
+        },
+        "frameworks": ["arduino"],
+        "name": "Olimex MOD-WIFI-ESP8266(-DEV)",
+        "platform": "espressif",
+        "upload": {
+            "maximum_ram_size": 81920,
+            "maximum_size": 1048576,
+            "resetmethod": "ck",
+            "require_upload_port" : true,
+            "speed": 115200
+        },
+        "url": "https://www.olimex.com/Products/IoT/MOD-WIFI-ESP8266-DEV/open-source-hardware",
+        "vendor": "Espressif"
+    },
+
+    "thing": {
+        "build": {
+            "core": "esp8266",
+            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_THING",
+            "f_cpu": "80000000L",
+            "ldscript": "esp8266.flash.512k64.ld",
+            "mcu": "esp8266",
+            "variant": "thing"
+        },
+        "frameworks": ["arduino"],
+        "name": "SparkFun ESP8266 Thing",
+        "platform": "espressif",
+        "upload": {
+            "maximum_ram_size": 81920,
+            "maximum_size": 524288,
+            "resetmethod": "nodemcu",
+            "require_upload_port" : true,
+            "speed": 921600
+        },
+        "url": "https://www.sparkfun.com/products/13231",
+        "vendor": "Espressif"
+    },
+
+    "esp210": {
+        "build": {
+            "core": "esp8266",
+            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP210",
+            "f_cpu": "80000000L",
+            "ldscript": "esp8266.flash.4m.ld",
+            "mcu": "esp8266",
+            "variant": "generic"
+        },
+        "frameworks": ["arduino"],
+        "name": "SweetPea ESP-210",
+        "platform": "espressif",
+        "upload": {
+            "maximum_ram_size": 81920,
+            "maximum_size": 1048576,
+            "resetmethod": "ck",
+            "require_upload_port" : true,
+            "speed": 115200
+        },
+        "url": "http://wiki.sweetpeas.se/index.php?title=ESP-210",
+        "vendor": "Espressif"
+    },
+
+    "d1": {
+        "build": {
+            "core": "esp8266",
+            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP12",
+            "f_cpu": "80000000L",
+            "ldscript": "esp8266.flash.4m.ld",
+            "mcu": "esp8266",
+            "variant": "d1"
+        },
+        "frameworks": ["arduino"],
+        "name": "WeMos D1",
+        "platform": "espressif",
+        "upload": {
+            "maximum_ram_size": 81920,
+            "maximum_size": 1048576,
+            "resetmethod": "nodemcu",
+            "require_upload_port" : true,
+            "speed": 460800
+        },
+        "url": "http://www.wemos.cc/wiki/doku.php?id=en:d1",
+        "vendor": "Espressif"
+    },
+
+    "d1_mini": {
+        "build": {
+            "core": "esp8266",
+            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP12",
+            "f_cpu": "80000000L",
+            "ldscript": "esp8266.flash.4m.ld",
+            "mcu": "esp8266",
+            "variant": "d1_mini"
+        },
+        "frameworks": ["arduino"],
+        "name": "WeMos D1 mini",
+        "platform": "espressif",
+        "upload": {
+            "maximum_ram_size": 81920,
+            "maximum_size": 1048576,
+            "resetmethod": "nodemcu",
+            "require_upload_port" : true,
+            "speed": 460800
+        },
+        "url": "http://www.wemos.cc/wiki/doku.php?id=en:d1_mini",
+        "vendor": "Espressif"
+    },
+
+    "espino": {
+        "build": {
+            "core": "esp8266",
+            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP12",
+            "f_cpu": "80000000L",
+            "ldscript": "esp8266.flash.4m1m.ld",
+            "mcu": "esp8266",
+            "variant": "espino"
+        },
+        "frameworks": ["arduino"],
+        "name": "ESPino",
+        "platform": "espressif",
+        "upload": {
+            "maximum_ram_size": 81920,
+            "maximum_size": 1048576,
+            "resetmethod": "ck",
+            "require_upload_port" : true,
+            "speed": 115200
+        },
+        "url": "http://www.espino.io",
+        "vendor": "Espressif"
     }
 }
diff --git a/platformio/boards/raspberrypi.json b/platformio/boards/raspberrypi.json
index ec4b7878..25c3485a 100644
--- a/platformio/boards/raspberrypi.json
+++ b/platformio/boards/raspberrypi.json
@@ -18,7 +18,6 @@
 
     "raspberrypi_2b": {
         "build": {
-            "core": "esp8266",
             "extra_flags": "-DRASPBERRYPI -DRASPBERRYPI2",
             "f_cpu": "900000000L",
             "mcu": "bcm2836"
diff --git a/setup.py b/setup.py
index 36231163..c7968fd5 100644
--- a/setup.py
+++ b/setup.py
@@ -74,7 +74,7 @@ setup(
     keywords=[
         "iot", "build tool", "compiler", "builder", "library manager",
         "embedded", "ci", "continuous integration", "arduino", "mbed",
-        "framework", "ide", "ide integration", "library.json", "make", "cmake",
-        "makefile", "mk"
+        "esp8266", "framework", "ide", "ide integration", "library.json",
+        "make", "cmake", "makefile", "mk"
     ]
 )