diff --git a/README.md b/README.md
index ad87537a1..330d8aae9 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,7 @@ Libraries that don't rely on low-level access to AVR registers should work well.
 
 
 #### Upload via serial port ####
-Select "esptool" as a programmer, and pick the correct serial port.
+Pick the correct serial port.
 You need to put ESP8266 into bootloader mode before uploading code (pull GPIO0 low and
 toggle power).
 
diff --git a/boards.txt b/boards.txt
index 63106726b..81f8f7ac5 100644
--- a/boards.txt
+++ b/boards.txt
@@ -26,6 +26,7 @@ esp01.menu.UploadSpeed.256000.upload.speed=256000
 esp01.menu.UploadSpeed.921600=921600
 esp01.menu.UploadSpeed.921600.upload.speed=921600
 
+esp01.upload.tool=esptool
 
 ##############################################################
 wifio.name=WIFIO
@@ -42,3 +43,4 @@ wifio.build.board=ESP8266_WIFIO
 wifio.build.core=esp8266
 wifio.build.variant=wifio
 
+wifio.upload.tool=esptool
diff --git a/platform.txt b/platform.txt
index 7dd38f590..27e0cf669 100644
--- a/platform.txt
+++ b/platform.txt
@@ -88,7 +88,8 @@ tools.esptool.cmd=esptool
 tools.esptool.cmd.windows=esptool.exe
 tools.esptool.path={runtime.ide.path}/hardware/tools/esp8266
 
-tools.esptool.program.params.verbose=-vv
-tools.esptool.program.params.quiet=
-tools.esptool.program.pattern="{path}/{cmd}" {program.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp {serial.port} -ca 0x00000 -cf "{build.path}/{build.project_name}_00000.bin" -ca 0x40000 -cf "{build.path}/{build.project_name}_40000.bin"
+tools.esptool.upload.protocol=esp
+tools.esptool.upload.params.verbose=-vv
+tools.esptool.upload.params.quiet=
+tools.esptool.upload.pattern="{path}/{cmd}" {upload.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp {serial.port} -ca 0x00000 -cf "{build.path}/{build.project_name}_00000.bin" -ca 0x40000 -cf "{build.path}/{build.project_name}_40000.bin"
 
diff --git a/programmers.txt b/programmers.txt
index 5be88335a..e69de29bb 100644
--- a/programmers.txt
+++ b/programmers.txt
@@ -1,6 +0,0 @@
-esptool.name=esptool
-esptool.communication=serial
-esptool.protocol=esp
-esptool.program.protocol=esp
-esptool.program.tool=esptool
-esptool.program.extra_params=