diff --git a/boards.txt b/boards.txt
index 3aba3feec..fdf37d570 100644
--- a/boards.txt
+++ b/boards.txt
@@ -134,7 +134,8 @@ modwifi.name=Olimex MOD-WIFI-ESP8266(-DEV)
 modwifi.upload.tool=esptool
 modwifi.upload.speed=115200
 modwifi.upload.resetmethod=ck
-modwifi.upload.maximum_size=2097152
+modwifi.upload.maximum_size=983040
+modwifi.upload.maximum_data_size=81920
 modwifi.upload.wait_for_upload_port=true
 modwifi.serial.disableDTR=true
 modwifi.serial.disableRTS=true
@@ -180,12 +181,13 @@ modwifi.menu.UploadSpeed.921600=921600
 modwifi.menu.UploadSpeed.921600.upload.speed=921600
 
 ##############################################################
-nodemcu.name=NodeMCU (ESP8266 ESP-12 Module)
+nodemcu.name=NodeMCU 0.9 (ESP-12 Module)
 
 nodemcu.upload.tool=esptool
 nodemcu.upload.speed=115200
 nodemcu.upload.resetmethod=ck
-nodemcu.upload.maximum_size=4194304
+nodemcu.upload.maximum_size=983040
+nodemcu.upload.maximum_data_size=81920
 nodemcu.upload.wait_for_upload_port=true
 nodemcu.serial.disableDTR=true
 nodemcu.serial.disableRTS=true
@@ -229,6 +231,57 @@ nodemcu.menu.UploadSpeed.512000.upload.speed=512000
 nodemcu.menu.UploadSpeed.921600=921600
 nodemcu.menu.UploadSpeed.921600.upload.speed=921600
 
+##############################################################
+nodemcuv2.name=NodeMCU 1.0 (ESP-12E Module)
+ 
+nodemcuv2.upload.tool=esptool
+nodemcuv2.upload.speed=115200
+nodemcuv2.upload.resetmethod=ck
+nodemcuv2.upload.maximum_size=983040
+nodemcuv2.upload.maximum_data_size=81920
+nodemcuv2.upload.wait_for_upload_port=true
+nodemcuv2.serial.disableDTR=true
+nodemcuv2.serial.disableRTS=true
+ 
+nodemcuv2.build.mcu=esp8266
+nodemcuv2.build.f_cpu=80000000L
+nodemcuv2.build.board=ESP8266_ESP12
+nodemcuv2.build.core=esp8266
+nodemcuv2.build.variant=nodemcu
+nodemcuv2.build.flash_mode=dio
+nodemcuv2.build.flash_size=4M
+nodemcuv2.build.flash_freq=40
+nodemcuv2.build.flash_ld=eagle.flash.4m.ld
+nodemcuv2.build.spiffs_start=0x100000
+nodemcuv2.build.spiffs_end=0x3FB000
+nodemcuv2.build.spiffs_pagesize=256
+nodemcuv2.build.spiffs_blocksize=8192
+ 
+nodemcuv2.menu.CpuFrequency.80=80 MHz
+nodemcuv2.menu.CpuFrequency.80.build.f_cpu=80000000L
+nodemcuv2.menu.CpuFrequency.160=160 MHz
+nodemcuv2.menu.CpuFrequency.160.build.f_cpu=160000000L
+ 
+nodemcuv2.menu.UploadSpeed.115200=115200
+nodemcuv2.menu.UploadSpeed.115200.upload.speed=115200
+nodemcuv2.menu.UploadSpeed.9600=9600
+nodemcuv2.menu.UploadSpeed.9600.upload.speed=9600
+nodemcuv2.menu.UploadSpeed.57600=57600
+nodemcuv2.menu.UploadSpeed.57600.upload.speed=57600
+nodemcuv2.menu.UploadSpeed.256000.windows=256000
+nodemcuv2.menu.UploadSpeed.256000.upload.speed=256000
+nodemcuv2.menu.UploadSpeed.230400.linux=230400
+nodemcuv2.menu.UploadSpeed.230400.macosx=230400
+nodemcuv2.menu.UploadSpeed.230400.macosx=230400
+nodemcuv2.menu.UploadSpeed.230400.upload.speed=230400
+nodemcuv2.menu.UploadSpeed.460800.linux=460800
+nodemcuv2.menu.UploadSpeed.460800.macosx=460800
+nodemcuv2.menu.UploadSpeed.460800.upload.speed=460800
+nodemcuv2.menu.UploadSpeed.512000.windows=512000
+nodemcuv2.menu.UploadSpeed.512000.upload.speed=512000
+nodemcuv2.menu.UploadSpeed.921600=921600
+nodemcuv2.menu.UploadSpeed.921600.upload.speed=921600
+
 ##############################################################
 # wifio.name=Wifio
 #
diff --git a/libraries/ESP8266WiFi/src/WiFiClient.cpp b/libraries/ESP8266WiFi/src/WiFiClient.cpp
index 534c7fa89..056d5bb65 100644
--- a/libraries/ESP8266WiFi/src/WiFiClient.cpp
+++ b/libraries/ESP8266WiFi/src/WiFiClient.cpp
@@ -40,6 +40,8 @@ extern "C"
 #include "include/ClientContext.h"
 #include "c_types.h"
 
+uint16_t WiFiClient::_localPort = 0;
+
 ICACHE_FLASH_ATTR WiFiClient::WiFiClient() 
 : _client(0)
 {
@@ -93,6 +95,10 @@ int ICACHE_FLASH_ATTR  WiFiClient::connect(IPAddress ip, uint16_t port)
     if (!pcb)
         return 0;
 
+    if (_localPort > 0) {
+        pcb->local_port = _localPort++;
+    }
+
     ip_addr_t addr;
     addr.addr = ip;
     tcp_arg(pcb, this);
diff --git a/libraries/ESP8266WiFi/src/WiFiClient.h b/libraries/ESP8266WiFi/src/WiFiClient.h
index f4063cbba..a15cb1b68 100644
--- a/libraries/ESP8266WiFi/src/WiFiClient.h
+++ b/libraries/ESP8266WiFi/src/WiFiClient.h
@@ -61,6 +61,7 @@ public:
   uint16_t  remotePort();
   bool getNoDelay();
   void setNoDelay(bool nodelay);
+  static void setLocalPortStart(uint16_t port) { _localPort = port; }
 
   template<typename T> size_t write(T &src){
     uint8_t obuf[1460];
@@ -97,6 +98,7 @@ private:
   void _err(int8_t err);
 
   ClientContext* _client;
+  static uint16_t _localPort;
 
 };
 
diff --git a/tools/sdk/ld/eagle.app.v6.common.ld b/tools/sdk/ld/eagle.app.v6.common.ld
index 986b441ff..a411c3391 100644
--- a/tools/sdk/ld/eagle.app.v6.common.ld
+++ b/tools/sdk/ld/eagle.app.v6.common.ld
@@ -13,6 +13,11 @@ PHDRS
 
 /*  Default entry point:  */
 ENTRY(call_user_start)
+EXTERN(_DebugExceptionVector)
+EXTERN(_DoubleExceptionVector)
+EXTERN(_KernelExceptionVector)
+EXTERN(_NMIExceptionVector)
+EXTERN(_UserExceptionVector)
 PROVIDE(_memmap_vecbase_reset = 0x40000000);
 /* Various memory-map dependent cache attribute settings: */
 _memmap_cacheattr_wb_base = 0x00000110;
@@ -158,6 +163,30 @@ SECTIONS
   {
     _stext = .;
     _text_start = ABSOLUTE(.);
+     *(.UserEnter.text)
+    . = ALIGN(16);
+    *(.DebugExceptionVector.text)
+    . = ALIGN(16);
+    *(.NMIExceptionVector.text)
+    . = ALIGN(16);
+    *(.KernelExceptionVector.text)
+    LONG(0)
+    LONG(0)
+    LONG(0)
+    LONG(0)
+    . = ALIGN(16);
+    *(.UserExceptionVector.text)
+    LONG(0)
+    LONG(0)
+    LONG(0)
+    LONG(0)
+    . = ALIGN(16);
+    *(.DoubleExceptionVector.text)
+    LONG(0)
+    LONG(0)
+    LONG(0)
+    LONG(0)
+    . = ALIGN (16);
     *(.entry.text)
     *(.init.literal)
     *(.init)