diff --git a/boards.txt b/boards.txt
index 332e80188..6b583efab 100644
--- a/boards.txt
+++ b/boards.txt
@@ -198,7 +198,7 @@ generic.menu.eesz.2M128.upload.maximum_size=1044464
 generic.menu.eesz.2M128.build.rfcal_addr=0x1FC000
 generic.menu.eesz.2M128.build.spiffs_start=0x1E0000
 generic.menu.eesz.2M128.build.spiffs_end=0x1FB000
-generic.menu.eesz.2M128.build.spiffs_blocksize=8192
+generic.menu.eesz.2M128.build.spiffs_blocksize=4096
 generic.menu.eesz.2M256=2M (256K SPIFFS)
 generic.menu.eesz.2M256.build.flash_size=2M
 generic.menu.eesz.2M256.build.flash_size_bytes=0x200000
@@ -208,7 +208,7 @@ generic.menu.eesz.2M256.upload.maximum_size=1044464
 generic.menu.eesz.2M256.build.rfcal_addr=0x1FC000
 generic.menu.eesz.2M256.build.spiffs_start=0x1C0000
 generic.menu.eesz.2M256.build.spiffs_end=0x1FB000
-generic.menu.eesz.2M256.build.spiffs_blocksize=8192
+generic.menu.eesz.2M256.build.spiffs_blocksize=4096
 generic.menu.eesz.2M512=2M (512K SPIFFS)
 generic.menu.eesz.2M512.build.flash_size=2M
 generic.menu.eesz.2M512.build.flash_size_bytes=0x200000
@@ -2546,7 +2546,7 @@ modwifi.menu.eesz.2M128.upload.maximum_size=1044464
 modwifi.menu.eesz.2M128.build.rfcal_addr=0x1FC000
 modwifi.menu.eesz.2M128.build.spiffs_start=0x1E0000
 modwifi.menu.eesz.2M128.build.spiffs_end=0x1FB000
-modwifi.menu.eesz.2M128.build.spiffs_blocksize=8192
+modwifi.menu.eesz.2M128.build.spiffs_blocksize=4096
 modwifi.menu.eesz.2M256=2M (256K SPIFFS)
 modwifi.menu.eesz.2M256.build.flash_size=2M
 modwifi.menu.eesz.2M256.build.flash_size_bytes=0x200000
@@ -2556,7 +2556,7 @@ modwifi.menu.eesz.2M256.upload.maximum_size=1044464
 modwifi.menu.eesz.2M256.build.rfcal_addr=0x1FC000
 modwifi.menu.eesz.2M256.build.spiffs_start=0x1C0000
 modwifi.menu.eesz.2M256.build.spiffs_end=0x1FB000
-modwifi.menu.eesz.2M256.build.spiffs_blocksize=8192
+modwifi.menu.eesz.2M256.build.spiffs_blocksize=4096
 modwifi.menu.eesz.2M512=2M (512K SPIFFS)
 modwifi.menu.eesz.2M512.build.flash_size=2M
 modwifi.menu.eesz.2M512.build.flash_size_bytes=0x200000
@@ -5398,7 +5398,7 @@ wifi_slot.menu.eesz.2M128.upload.maximum_size=1044464
 wifi_slot.menu.eesz.2M128.build.rfcal_addr=0x1FC000
 wifi_slot.menu.eesz.2M128.build.spiffs_start=0x1E0000
 wifi_slot.menu.eesz.2M128.build.spiffs_end=0x1FB000
-wifi_slot.menu.eesz.2M128.build.spiffs_blocksize=8192
+wifi_slot.menu.eesz.2M128.build.spiffs_blocksize=4096
 wifi_slot.menu.eesz.2M256=2M (256K SPIFFS)
 wifi_slot.menu.eesz.2M256.build.flash_size=2M
 wifi_slot.menu.eesz.2M256.build.flash_size_bytes=0x200000
@@ -5408,7 +5408,7 @@ wifi_slot.menu.eesz.2M256.upload.maximum_size=1044464
 wifi_slot.menu.eesz.2M256.build.rfcal_addr=0x1FC000
 wifi_slot.menu.eesz.2M256.build.spiffs_start=0x1C0000
 wifi_slot.menu.eesz.2M256.build.spiffs_end=0x1FB000
-wifi_slot.menu.eesz.2M256.build.spiffs_blocksize=8192
+wifi_slot.menu.eesz.2M256.build.spiffs_blocksize=4096
 wifi_slot.menu.eesz.2M512=2M (512K SPIFFS)
 wifi_slot.menu.eesz.2M512.build.flash_size=2M
 wifi_slot.menu.eesz.2M512.build.flash_size_bytes=0x200000
diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json
index 0a85b00e1..49bcb1229 100644
--- a/package/package_esp8266com_index.template.json
+++ b/package/package_esp8266com_index.template.json
@@ -15,97 +15,97 @@
                "architecture": "esp8266",
                "archiveFileName": "",
                "boards": [
-                  {
-                     "name": "Generic ESP8266 Module"
-                  },
-                  {
-                     "name": "Generic ESP8285 Module"
-                  },
-                  {
-                     "name": "ESPDuino (ESP-13 Module)"
-                  },
-                  {
-                     "name": "Adafruit Feather HUZZAH ESP8266"
-                  },
-                  {
-                     "name": "Invent One"
-                  },
-                  {
-                     "name": "XinaBox CW01"
-                  },
-                  {
-                     "name": "ESPresso Lite 1.0"
-                  },
-                  {
-                     "name": "ESPresso Lite 2.0"
-                  },
-                  {
-                     "name": "Phoenix 1.0"
-                  },
-                  {
-                     "name": "Phoenix 2.0"
-                  },
-                  {
-                     "name": "NodeMCU 0.9 (ESP-12 Module)"
-                  },
-                  {
-                     "name": "NodeMCU 1.0 (ESP-12E Module)"
-                  },
-                  {
-                     "name": "Olimex MOD-WIFI-ESP8266(-DEV)"
-                  },
-                  {
-                     "name": "SparkFun ESP8266 Thing"
-                  },
-                  {
-                     "name": "SparkFun ESP8266 Thing Dev"
-                  },
-                  {
-                     "name": "SweetPea ESP-210"
-                  },
-                  {
-                     "name": "LOLIN(WEMOS) D1 R2 & mini"
-                  },
-                  {
-                     "name": "LOLIN(WEMOS) D1 mini Pro"
-                  },
-                  {
-                     "name": "LOLIN(WEMOS) D1 mini Lite"
-                  },
-                  {
-                     "name": "WeMos D1 R1"
-                  },
-                  {
-                     "name": "ESPino (ESP-12 Module)"
-                  },
-                  {
-                     "name": "ThaiEasyElec's ESPino"
-                  },
-                  {
-                     "name": "WifInfo"
-                  },
-                  {
-                     "name": "Arduino"
-                  },
-                  {
-                     "name": "4D Systems gen4 IoD Range"
-                  },
-                  {
-                     "name": "Digistump Oak"
-                  },
-                  {
-                     "name": "WiFiduino"
-                  },
-                  {
-                     "name": "Amperka WiFi Slot"
-                  },
-                  {
-                     "name": "Seeed Wio Link"
-                  },
-                  {
-                     "name": "ESPectro Core"
-                  }
-               ],
+            {
+              "name": "Generic ESP8266 Module"
+            },
+            {
+              "name": "Generic ESP8285 Module"
+            },
+            {
+              "name": "ESPDuino (ESP-13 Module)"
+            },
+            {
+              "name": "Adafruit Feather HUZZAH ESP8266"
+            },
+            {
+              "name": "Invent One"
+            },
+            {
+              "name": "XinaBox CW01"
+            },
+            {
+              "name": "ESPresso Lite 1.0"
+            },
+            {
+              "name": "ESPresso Lite 2.0"
+            },
+            {
+              "name": "Phoenix 1.0"
+            },
+            {
+              "name": "Phoenix 2.0"
+            },
+            {
+              "name": "NodeMCU 0.9 (ESP-12 Module)"
+            },
+            {
+              "name": "NodeMCU 1.0 (ESP-12E Module)"
+            },
+            {
+              "name": "Olimex MOD-WIFI-ESP8266(-DEV)"
+            },
+            {
+              "name": "SparkFun ESP8266 Thing"
+            },
+            {
+              "name": "SparkFun ESP8266 Thing Dev"
+            },
+            {
+              "name": "SweetPea ESP-210"
+            },
+            {
+              "name": "LOLIN(WEMOS) D1 R2 & mini"
+            },
+            {
+              "name": "LOLIN(WEMOS) D1 mini Pro"
+            },
+            {
+              "name": "LOLIN(WEMOS) D1 mini Lite"
+            },
+            {
+              "name": "WeMos D1 R1"
+            },
+            {
+              "name": "ESPino (ESP-12 Module)"
+            },
+            {
+              "name": "ThaiEasyElec's ESPino"
+            },
+            {
+              "name": "WifInfo"
+            },
+            {
+              "name": "Arduino"
+            },
+            {
+              "name": "4D Systems gen4 IoD Range"
+            },
+            {
+              "name": "Digistump Oak"
+            },
+            {
+              "name": "WiFiduino"
+            },
+            {
+              "name": "Amperka WiFi Slot"
+            },
+            {
+              "name": "Seeed Wio Link"
+            },
+            {
+              "name": "ESPectro Core"
+            }
+          ],
                "toolsDependencies": [
                   {
                      "packager": "esp8266",
diff --git a/tools/boards.txt.py b/tools/boards.txt.py
index c6e10ff56..e45d39b79 100755
--- a/tools/boards.txt.py
+++ b/tools/boards.txt.py
@@ -1154,7 +1154,10 @@ def flash_map (flashsize_kb, spiffs_kb = 0):
     else:
         max_upload_size = 1024 * 1024 - reserved
         spiffs_start = (flashsize_kb - spiffs_kb) * 1024
-        spiffs_blocksize = 8192
+        if spiffs_kb < 512:
+            spiffs_blocksize = 4096
+        else:
+            spiffs_blocksize = 8192
 
     strsize = str(flashsize_kb / 1024) + 'M' if (flashsize_kb >= 1024) else str(flashsize_kb) + 'K'
     strspiffs = str(spiffs_kb / 1024) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) + 'K'