diff --git a/boards.txt b/boards.txt
index ea819444bc..8ed16f539f 100644
--- a/boards.txt
+++ b/boards.txt
@@ -584,6 +584,8 @@ d1.menu.UploadTool.esptool.upload.verbose=-vv
 d1.menu.UploadTool.espota=OTA
 d1.menu.UploadTool.espota.upload.tool=espota
 
+d1.menu.UploadSpeed.921600=921600
+d1.menu.UploadSpeed.921600.upload.speed=921600
 d1.menu.UploadSpeed.115200=115200
 d1.menu.UploadSpeed.115200.upload.speed=115200
 d1.menu.UploadSpeed.9600=9600
@@ -601,8 +603,7 @@ d1.menu.UploadSpeed.460800.macosx=460800
 d1.menu.UploadSpeed.460800.upload.speed=460800
 d1.menu.UploadSpeed.512000.windows=512000
 d1.menu.UploadSpeed.512000.upload.speed=512000
-d1.menu.UploadSpeed.921600=921600
-d1.menu.UploadSpeed.921600.upload.speed=921600
+
 
 d1.menu.FlashSize.4M3M=4M (3M SPIFFS)
 d1.menu.FlashSize.4M3M.build.flash_size=4M
@@ -654,6 +655,8 @@ d1_mini.menu.UploadTool.esptool.upload.verbose=-vv
 d1_mini.menu.UploadTool.espota=OTA
 d1_mini.menu.UploadTool.espota.upload.tool=espota
 
+d1_mini.menu.UploadSpeed.921600=921600
+d1_mini.menu.UploadSpeed.921600.upload.speed=921600
 d1_mini.menu.UploadSpeed.115200=115200
 d1_mini.menu.UploadSpeed.115200.upload.speed=115200
 d1_mini.menu.UploadSpeed.9600=9600
@@ -671,8 +674,7 @@ d1_mini.menu.UploadSpeed.460800.macosx=460800
 d1_mini.menu.UploadSpeed.460800.upload.speed=460800
 d1_mini.menu.UploadSpeed.512000.windows=512000
 d1_mini.menu.UploadSpeed.512000.upload.speed=512000
-d1_mini.menu.UploadSpeed.921600=921600
-d1_mini.menu.UploadSpeed.921600.upload.speed=921600
+
 
 d1_mini.menu.FlashSize.4M3M=4M (3M SPIFFS)
 d1_mini.menu.FlashSize.4M3M.build.flash_size=4M
diff --git a/doc/boards.md b/doc/boards.md
index 746e395d8d..9aec334ded 100644
--- a/doc/boards.md
+++ b/doc/boards.md
@@ -10,6 +10,8 @@ title: Supported Hardware
 - [SparkFun ESP8266 Thing](#sparkfun-esp8266-thing)
 - [SweetPea ESP-210](#sweetpea-esp-210)
 - [Generic ESP8266 modules](#generic-esp8266-modules)
+- [WeMos D1](#wemos-d1)
+- [WeMos D1 mini](#wemos-d1-mini)
 
 ### Adafruit HUZZAH ESP8266 (ESP-12)
 
@@ -212,4 +214,7 @@ the first value respects the pin setup of the Pins 0, 2 and 15.
 note:
  - number = ((GPIO15 << 2) | (GPIO0 << 1) | GPIO2);
 
-
+### WeMos D1
+Product page: http://wemos.cc
+### WeMos D1 mini
+Product page: http://wemos.cc
diff --git a/doc/reference.md b/doc/reference.md
index 10df552197..7165eb47f7 100644
--- a/doc/reference.md
+++ b/doc/reference.md
@@ -167,6 +167,7 @@ NodeMCU 1.0    | 4M | 1M, 3M
 Olimex MOD-WIFI-ESP8266(-DEV)| 2M | 1M
 SparkFun Thing | 512k | 64k
 SweetPea ESP-210 | 4M | 1M, 3M
+WeMos D1 & D1 mini | 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 9535db4a19..ee10424507 100644
--- a/package/package_esp8266com_index.template.json
+++ b/package/package_esp8266com_index.template.json
@@ -42,6 +42,12 @@
             },
             {
               "name": "SweetPea ESP-210"
+            },
+			{
+              "name": "WeMos D1"
+            },
+			{
+              "name": "WeMos D1 mini"
             }
           ],
           "toolsDependencies": [