diff --git a/boards.txt b/boards.txt
index adafdc9ec..d070048fb 100644
--- a/boards.txt
+++ b/boards.txt
@@ -19,7 +19,7 @@ wifio.name=WIFIO
 
 wifio.upload.tool=esptool
 wifio.upload.speed=115200
-wifio.upload.resetmethod=wifio2
+wifio.upload.resetmethod=wifio
 wifio.upload.maximum_size=524288
 wifio.upload.wait_for_upload_port=true
 
@@ -27,6 +27,5 @@ wifio.build.mcu=esp8266
 wifio.build.f_cpu=80000000L
 wifio.build.board=ESP8266_WIFIO
 wifio.build.core=esp8266
-# TODO: add board variant for WIFIO
 wifio.build.variant=wifio
 
diff --git a/libraries/ESP8266WebServer/examples/HelloServer/HelloServer.ino b/libraries/ESP8266WebServer/examples/HelloServer/HelloServer.ino
index 5cbbf9b4b..345800ba1 100644
--- a/libraries/ESP8266WebServer/examples/HelloServer/HelloServer.ino
+++ b/libraries/ESP8266WebServer/examples/HelloServer/HelloServer.ino
@@ -12,7 +12,7 @@ const int led = 13;
  
 void handle_root() {
   digitalWrite(led, 1);
-  server.send(200, "text/plain", form);
+  server.send(200, "text/plain", "hello from esp8266!");
   delay(100);
   digitalWrite(led, 0);
 }
diff --git a/libraries/ESP8266WebServer/library.properties b/libraries/ESP8266WebServer/library.properties
new file mode 100644
index 000000000..4dd12d3ba
--- /dev/null
+++ b/libraries/ESP8266WebServer/library.properties
@@ -0,0 +1,9 @@
+name=ESP8266WebServer
+version=1.0
+author=Ivan Grokhotkov
+maintainer=Ivan Grokhtkov <ivan@esp8266.com>
+sentence=Simple web server library
+paragraph=The library supports HTTP GET and POST requests, provides argument parsing, handles one client at a time.
+category=Communication
+url=
+architectures=esp8266
diff --git a/libraries/ESP8266WiFi/library.properties b/libraries/ESP8266WiFi/library.properties
index 0ac9b0f71..3db731e8e 100644
--- a/libraries/ESP8266WiFi/library.properties
+++ b/libraries/ESP8266WiFi/library.properties
@@ -1,9 +1,9 @@
 name=ESP8266WiFi
-version=1.2
-author=Arduino
-maintainer=Arduino <info@arduino.cc>
-sentence=Enables network connection (local and Internet) using the Arduino WiFi shield. For all Arduino boards.
+version=1.0
+author=Ivan Grokhotkov
+maintainer=Ivan Grokhtkov <ivan@esp8266.com>
+sentence=Enables network connection (local and Internet) using the ESP8266 built-in WiFi.
 paragraph=With this library you can instantiate Servers, Clients and send/receive UDP packets through WiFi. The shield can connect either to open or encrypted networks (WEP, WPA). The IP address can be assigned statically or through a DHCP. The library can also manage DNS.
 category=Communication
-url=http://arduino.cc/en/Reference/WiFi
-architectures=*
+url=
+architectures=esp8266