diff --git a/HISTORY.rst b/HISTORY.rst
index 4ba4ee4d..30f8ff14 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,6 +7,9 @@ PlatformIO 2.0
 2.8.5 (2016-02-??)
 ~~~~~~~~~~~~~~~~~~
 
+* Added support for the ESP8266 ESP-07 board to
+  `Espressif <http://docs.platformio.org/en/latest/platforms/espressif.html>`__
+  (`issue #527 <https://github.com/platformio/platformio/issues/527>`_)
 * Improved handling of String-based ``CPPDEFINES`` passed to extra ``build_flags``
   (`issue #526 <https://github.com/platformio/platformio/issues/526>`_)
 * Fixed issue with incorrect handling of user's build flags where the base flags
diff --git a/platformio/boards/espressif.json b/platformio/boards/espressif.json
index b3c9728e..a3a5b0a5 100644
--- a/platformio/boards/espressif.json
+++ b/platformio/boards/espressif.json
@@ -49,6 +49,31 @@
         "vendor": "Espressif"
     },
 
+    "esp07": {
+        "build": {
+            "core": "esp8266",
+            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP07",
+            "f_cpu": "80000000L",
+            "f_flash": "40000000L",
+            "flash_mode": "qio",
+            "ldscript": "esp8266.flash.4m1m.ld",
+            "mcu": "esp8266",
+            "variant": "nodemcu"
+        },
+        "frameworks": ["arduino"],
+        "name": "Espressif Generic ESP8266 ESP-07",
+        "platform": "espressif",
+        "upload": {
+            "maximum_ram_size": 81920,
+            "maximum_size": 4194304,
+            "resetmethod": "nodemcu",
+            "require_upload_port" : true,
+            "speed": 115200
+        },
+        "url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family#esp-07",
+        "vendor": "Espressif"
+    },
+
     "esp12e": {
         "build": {
             "core": "esp8266",