diff --git a/boards.txt b/boards.txt
index 51903c665..19909edaf 100644
--- a/boards.txt
+++ b/boards.txt
@@ -25,6 +25,8 @@ generic.build.flash_freq=40
 generic.build.flash_ld=eagle.flash.512k.ld
 generic.build.spiffs_start=0x6B000
 generic.build.spiffs_end=0x7B000
+generic.build.spiffs_pagesize=256
+generic.build.spiffs_blocksize=4096
 
 generic.menu.CpuFrequency.80=80 MHz
 generic.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -60,6 +62,7 @@ generic.menu.FlashSize.1M512.build.flash_size=1M
 generic.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld
 generic.menu.FlashSize.1M512.build.spiffs_start=0x6B000
 generic.menu.FlashSize.1M512.build.spiffs_end=0xFB000
+generic.menu.FlashSize.1M512.build.spiffs_blocksize=8192
 generic.menu.FlashSize.1M256=1M (256K SPIFFS)
 generic.menu.FlashSize.1M256.build.flash_size=1M
 generic.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld
@@ -80,21 +83,27 @@ generic.menu.FlashSize.2M.build.flash_size=2M
 generic.menu.FlashSize.2M.build.flash_ld=eagle.flash.2m.ld
 generic.menu.FlashSize.2M.build.spiffs_start=0x100000
 generic.menu.FlashSize.2M.build.spiffs_end=0x1FB000
+generic.menu.FlashSize.2M.build.spiffs_blocksize=8192
 generic.menu.FlashSize.4M=4M (3M SPIFFS)
 generic.menu.FlashSize.4M.build.flash_size=4M
 generic.menu.FlashSize.4M.build.flash_ld=eagle.flash.4m.ld
 generic.menu.FlashSize.4M.build.spiffs_start=0x100000
 generic.menu.FlashSize.4M.build.spiffs_end=0x3FB000
-generic.menu.FlashSize.8M=8M (7M SPIFFS)
-generic.menu.FlashSize.8M.build.flash_size=1M
-generic.menu.FlashSize.8M.build.flash_ld=eagle.flash.8m.ld
-generic.menu.FlashSize.8M.build.spiffs_start=0x100000
-generic.menu.FlashSize.8M.build.spiffs_end=0x800000
-generic.menu.FlashSize.16M=16M (15M SPIFFS)
-generic.menu.FlashSize.16M.build.flash_size=1M
-generic.menu.FlashSize.16M.build.flash_ld=eagle.flash.16m.ld
-generic.menu.FlashSize.16M.build.spiffs_start=0x100000
-generic.menu.FlashSize.16M.build.spiffs_end=0x1000000
+generic.menu.FlashSize.4M.build.spiffs_blocksize=8192
+
+# disabled because espressif's bootloader refuses to write above 4M
+# generic.menu.FlashSize.8M=8M (7M SPIFFS)
+# generic.menu.FlashSize.8M.build.flash_size=1M
+# generic.menu.FlashSize.8M.build.flash_ld=eagle.flash.8m.ld
+# generic.menu.FlashSize.8M.build.spiffs_start=0x100000
+# generic.menu.FlashSize.8M.build.spiffs_end=0x800000
+# generic.menu.FlashSize.8M.build.spiffs_blocksize=8192
+# generic.menu.FlashSize.16M=16M (15M SPIFFS)
+# generic.menu.FlashSize.16M.build.flash_size=1M
+# generic.menu.FlashSize.16M.build.flash_ld=eagle.flash.16m.ld
+# generic.menu.FlashSize.16M.build.spiffs_start=0x100000
+# generic.menu.FlashSize.16M.build.spiffs_end=0x1000000
+# generic.menu.FlashSize.16M.build.spiffs_blocksize=8192
 
 # generic.menu.FlashFreq.40=40MHz
 # generic.menu.FlashFreq.40.build.flash_freq=40
@@ -124,6 +133,8 @@ modwifi.build.flash_freq=40
 modwifi.build.flash_ld=eagle.flash.2m.ld
 modwifi.build.spiffs_start=0x100000
 modwifi.build.spiffs_end=0x1FB000
+modwifi.build.spiffs_pagesize=256
+modwifi.build.spiffs_blocksize=8192
 
 modwifi.menu.CpuFrequency.80=80 MHz
 modwifi.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -172,6 +183,8 @@ nodemcu.build.flash_freq=40
 nodemcu.build.flash_ld=eagle.flash.4m.ld
 nodemcu.build.spiffs_start=0x100000
 nodemcu.build.spiffs_end=0x3FB000
+nodemcu.build.spiffs_pagesize=256
+nodemcu.build.spiffs_blocksize=8192
 
 nodemcu.menu.CpuFrequency.80=80 MHz
 nodemcu.menu.CpuFrequency.80.build.f_cpu=80000000L