diff --git a/libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer.cpp b/libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer.cpp
index 2ed37c502..fa7b7ac35 100644
--- a/libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer.cpp
+++ b/libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer.cpp
@@ -36,12 +36,9 @@ void ESP8266HTTPUpdateServer::setup(ESP8266WebServer *server)
       _server->sendHeader("Access-Control-Allow-Origin", "*");
       _server->send(200, "text/plain", (Update.hasError())?"FAIL":"OK");
       ESP.restart();
-    });
-
-    // handler for the file upload, get's the sketch bytes, and writes
-    // them through the Update object.
-    _server->onFileUpload([&](){
-      if(_server->uri() != "/update") return;
+    },[&](){
+      // handler for the file upload, get's the sketch bytes, and writes
+      // them through the Update object
       HTTPUpload& upload = _server->upload();
       if(upload.status == UPLOAD_FILE_START){
         if (_serial_output)
@@ -70,6 +67,6 @@ void ESP8266HTTPUpdateServer::setup(ESP8266WebServer *server)
         Update.end();
         if (_serial_output) Serial.println("Update was aborted");
       }
-      yield();
+      delay(0);
     });
 }
diff --git a/libraries/ESP8266WebServer/examples/FSBrowser/FSBrowser.ino b/libraries/ESP8266WebServer/examples/FSBrowser/FSBrowser.ino
index f8b43e34d..4df717d70 100644
--- a/libraries/ESP8266WebServer/examples/FSBrowser/FSBrowser.ino
+++ b/libraries/ESP8266WebServer/examples/FSBrowser/FSBrowser.ino
@@ -207,10 +207,9 @@ void setup(void){
   server.on("/edit", HTTP_PUT, handleFileCreate);
   //delete file
   server.on("/edit", HTTP_DELETE, handleFileDelete);
-  //called after file upload
-  server.on("/edit", HTTP_POST, [](){ server.send(200, "text/plain", ""); });
-  //called when a file is received inside POST data
-  server.onFileUpload(handleFileUpload);
+  //first callback is called after the request has ended with all parsed arguments
+  //second callback handles file uploads at that location
+  server.on("/edit", HTTP_POST, [](){ server.send(200, "text/plain", ""); }, handleFileUpload);
 
   //called when the url is not defined here
   //use it to load content from SPIFFS
diff --git a/libraries/ESP8266WebServer/examples/SDWebServer/SDWebServer.ino b/libraries/ESP8266WebServer/examples/SDWebServer/SDWebServer.ino
index c62cadfd6..b42b1d097 100644
--- a/libraries/ESP8266WebServer/examples/SDWebServer/SDWebServer.ino
+++ b/libraries/ESP8266WebServer/examples/SDWebServer/SDWebServer.ino
@@ -256,9 +256,8 @@ void setup(void){
   server.on("/list", HTTP_GET, printDirectory);
   server.on("/edit", HTTP_DELETE, handleDelete);
   server.on("/edit", HTTP_PUT, handleCreate);
-  server.on("/edit", HTTP_POST, [](){ returnOK(); });
+  server.on("/edit", HTTP_POST, [](){ returnOK(); }, handleFileUpload);
   server.onNotFound(handleNotFound);
-  server.onFileUpload(handleFileUpload);
 
   server.begin();
   DBG_OUTPUT_PORT.println("HTTP server started");
diff --git a/libraries/ESP8266WebServer/examples/WebUpdate/WebUpdate.ino b/libraries/ESP8266WebServer/examples/WebUpdate/WebUpdate.ino
index 665dd6199..c5e67ef33 100644
--- a/libraries/ESP8266WebServer/examples/WebUpdate/WebUpdate.ino
+++ b/libraries/ESP8266WebServer/examples/WebUpdate/WebUpdate.ino
@@ -27,8 +27,12 @@ void setup(void){
       server.sendHeader("Access-Control-Allow-Origin", "*");
       server.send(200, "text/html", serverIndex);
     });
-    server.onFileUpload([](){
-      if(server.uri() != "/update") return;
+    server.on("/update", HTTP_POST, [](){
+      server.sendHeader("Connection", "close");
+      server.sendHeader("Access-Control-Allow-Origin", "*");
+      server.send(200, "text/plain", (Update.hasError())?"FAIL":"OK");
+      ESP.restart();
+    },[](){
       HTTPUpload& upload = server.upload();
       if(upload.status == UPLOAD_FILE_START){
         Serial.setDebugOutput(true);
@@ -52,12 +56,6 @@ void setup(void){
       }
       yield();
     });
-    server.on("/update", HTTP_POST, [](){
-      server.sendHeader("Connection", "close");
-      server.sendHeader("Access-Control-Allow-Origin", "*");
-      server.send(200, "text/plain", (Update.hasError())?"FAIL":"OK");
-      ESP.restart();
-    });
     server.begin();
     MDNS.addService("http", "tcp", 80);