diff --git a/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp b/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
index 325fb7532..26a7344f3 100644
--- a/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
+++ b/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
@@ -76,7 +76,7 @@ int ESP8266WiFiClass::begin(const char* ssid, const char *passphrase)
     wifi_station_connect();
     ETS_UART_INTR_ENABLE();
     wifi_station_dhcpc_start();
-    return 0;
+    return status();
 }
 
 void ESP8266WiFiClass::config(IPAddress local_ip, IPAddress gateway, IPAddress subnet)
diff --git a/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h b/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h
index fdf2d35d2..f41116e48 100644
--- a/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h
+++ b/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h
@@ -137,6 +137,15 @@ public:
      */
     char* SSID();
 
+    /*
+     * Return the current network RSSI. Note: this is just a stub, there is no way to
+     *  get the RSSI in the Espressif SDK yet.
+     *
+     * return: RSSI value (currently 0)
+     */
+
+    int32_t RSSI() { return 0; }
+
     /*
      * Start scan WiFi networks available
      *
diff --git a/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/include/wl_definitions.h b/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/include/wl_definitions.h
index ecdbcc322..a32ba45b2 100644
--- a/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/include/wl_definitions.h
+++ b/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/include/wl_definitions.h
@@ -48,6 +48,7 @@
 #define WL_MAX_ATTEMPT_CONNECTION	10
 
 typedef enum {
+    WL_NO_SHIELD = 255,   // for compatibility with WiFi Shield library
     WL_IDLE_STATUS = 0,
     WL_NO_SSID_AVAIL,
     WL_SCAN_COMPLETED,