diff --git a/boards.txt b/boards.txt
index 818b26ce25..5edf4f2631 100644
--- a/boards.txt
+++ b/boards.txt
@@ -1316,6 +1316,65 @@ d1_mini.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
 d1_mini.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
 d1_mini.menu.FlashSize.4M1M.build.spiffs_pagesize=256
 
+##############################################################
+d1_mini_pro.name=WeMos D1 mini Pro
+
+d1_mini_pro.upload.tool=esptool
+d1_mini_pro.upload.speed=460800
+d1_mini_pro.upload.resetmethod=nodemcu
+d1_mini_pro.upload.maximum_size=1044464
+d1_mini_pro.upload.maximum_data_size=81920
+d1_mini_pro.upload.wait_for_upload_port=true
+
+d1_mini_pro.serial.disableDTR=true
+d1_mini_pro.serial.disableRTS=true
+
+d1_mini_pro.build.mcu=esp8266
+d1_mini_pro.build.f_cpu=80000000L
+d1_mini_pro.build.board=ESP8266_WEMOS_D1MINI
+d1_mini_pro.build.core=esp8266
+d1_mini_pro.build.variant=d1_mini
+d1_mini_pro.build.flash_mode=dio
+d1_mini_pro.build.flash_size=16M
+d1_mini_pro.build.flash_freq=40
+d1_mini_pro.build.debug_port=
+d1_mini_pro.build.debug_level=
+
+d1_mini_pro.menu.CpuFrequency.80=80 MHz
+d1_mini_pro.menu.CpuFrequency.80.build.f_cpu=80000000L
+d1_mini_pro.menu.CpuFrequency.160=160 MHz
+d1_mini_pro.menu.CpuFrequency.160.build.f_cpu=160000000L
+
+d1_mini_pro.menu.UploadSpeed.921600=921600
+d1_mini_pro.menu.UploadSpeed.921600.upload.speed=921600
+d1_mini_pro.menu.UploadSpeed.115200=115200
+d1_mini_pro.menu.UploadSpeed.115200.upload.speed=115200
+d1_mini_pro.menu.UploadSpeed.9600=9600
+d1_mini_pro.menu.UploadSpeed.9600.upload.speed=9600
+d1_mini_pro.menu.UploadSpeed.57600=57600
+d1_mini_pro.menu.UploadSpeed.57600.upload.speed=57600
+d1_mini_pro.menu.UploadSpeed.256000.windows=256000
+d1_mini_pro.menu.UploadSpeed.256000.upload.speed=256000
+d1_mini_pro.menu.UploadSpeed.230400.linux=230400
+d1_mini_pro.menu.UploadSpeed.230400.macosx=230400
+d1_mini_pro.menu.UploadSpeed.230400.macosx=230400
+d1_mini_pro.menu.UploadSpeed.230400.upload.speed=230400
+d1_mini_pro.menu.UploadSpeed.460800.linux=460800
+d1_mini_pro.menu.UploadSpeed.460800.macosx=460800
+d1_mini_pro.menu.UploadSpeed.460800.upload.speed=460800
+d1_mini_pro.menu.UploadSpeed.512000.windows=512000
+d1_mini_pro.menu.UploadSpeed.512000.upload.speed=512000
+
+
+d1_mini_pro.menu.FlashSize.16M15M=16M (15M SPIFFS)
+d1_mini_pro.menu.FlashSize.16M15M.build.flash_size=16M
+d1_mini_pro.menu.FlashSize.16M15M.build.flash_ld=eagle.flash.16m.ld
+d1_mini_pro.menu.FlashSize.16M15M.build.spiffs_start=0x100000
+d1_mini_pro.menu.FlashSize.16M15M.build.spiffs_end=0x17FB000
+d1_mini_pro.menu.FlashSize.16M15M.build.spiffs_pagesize=256
+d1_mini_pro.menu.FlashSize.16M15M.build.spiffs_blocksize=8192
+d1_mini_pro.menu.FlashSize.16M15M.upload.maximum_size=1044464
+
 ##############################################################
 d1.name=WeMos D1(Retired)
 
diff --git a/doc/boards.md b/doc/boards.md
index f500263b0d..ef4a17d6f6 100644
--- a/doc/boards.md
+++ b/doc/boards.md
@@ -32,6 +32,7 @@ title: Supported Hardware
     * [boot mode](#boot-mode)
   * [WeMos D1](#wemos-d1)
   * [WeMos D1 mini](#wemos-d1-mini)
+  * [WeMos D1 mini Pro](#wemos-d1-mini-pro)
   * [ESPino by ThaiEasyElec](#espinotee)
 
 ## Adafruit HUZZAH ESP8266 (ESP-12)
@@ -289,10 +290,16 @@ All points related to bootstrapping resistors and recommended circuits listed ab
 Note that since ESP8285 has SPI flash memory internally connected in DOUT mode, pins 9 and 10 may be used as GPIO / I2C / PWM pins.
 
 ## WeMos D1
-Product page: http://wemos.cc
+
+Product page: http://www.wemos.cc/product/d1.html
 
 ## WeMos D1 mini
-Product page: http://wemos.cc
+
+Product page: http://www.wemos.cc/product/d1-mini.html
+
+## WeMos D1 mini Pro
+
+Product page: http://www.wemos.cc/product/d1-mini-pro.html
 
 ## ESPino (WROOM-02 Module) by ThaiEasyElec
 ESPino by ThaiEasyElec using WROOM-02 module from Espressif Systems with 4 MB Flash.
diff --git a/doc/filesystem.md b/doc/filesystem.md
index e7987d63c2..1be705fb0a 100644
--- a/doc/filesystem.md
+++ b/doc/filesystem.md
@@ -52,6 +52,7 @@ Olimex MOD-WIFI-ESP8266(-DEV)| 2M | 1M
 SparkFun Thing | 512k | 64k
 SweetPea ESP-210 | 4M | 1M, 3M
 WeMos D1 & D1 mini | 4M | 1M, 3M
+WeMos D1 mini Pro | 16M | 1M, 15M
 ESPDuino | 4M | 1M, 3M
 
 **Note:** to use any of file system functions in the sketch, add the following include to the sketch:
diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json
index 5493d51278..825e41c4bb 100644
--- a/package/package_esp8266com_index.template.json
+++ b/package/package_esp8266com_index.template.json
@@ -61,6 +61,9 @@
             {
               "name": "WeMos D1 mini"
             },
+            {
+              "name": "WeMos D1 mini Pro"
+            },
             {
               "name": "ESPino (ESP-12 Module)"
             },