diff --git a/.gitignore b/.gitignore
index a686ac78..92b4ae92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
-
 tools/xtensa-esp32-elf
 tools/dist
 tools/esptool
 tools/esptool.exe
+tools/mkspiffs/mkspiffs
+tools/mkspiffs/mkspiffs.exe
diff --git a/package/package_esp32_index.template.json b/package/package_esp32_index.template.json
index a41ef215..fb1a1f03 100644
--- a/package/package_esp32_index.template.json
+++ b/package/package_esp32_index.template.json
@@ -39,6 +39,11 @@
               "packager": "esp32",
               "name": "esptool",
               "version": "4dab24e"
+            },
+            {
+              "packager": "esp32",
+              "name": "mkspiffs",
+              "version": "0.2.1"
             }
           ]
         }
@@ -97,6 +102,54 @@
               "size": "3869525"
             }
           ]
+        },
+        {
+          "name": "mkspiffs",
+          "version": "0.2.1",
+          "systems": [
+            {
+              "host": "i686-mingw32",
+              "url": "https://github.com/igrr/mkspiffs/releases/download/0.2.1/mkspiffs-0.2.1-windows.zip",
+              "archiveFileName": "mkspiffs-0.2.1-windows.zip",
+              "checksum": "SHA-256:baf7b661f8f6128300a33ca20a2158fd9d0bcdad389c4424f913fe3ad08d2dd5",
+              "size": "347207"
+            },
+            {
+              "host": "x86_64-apple-darwin",
+              "url": "https://github.com/igrr/mkspiffs/releases/download/0.2.1/mkspiffs-0.2.1-osx.tar.gz",
+              "archiveFileName": "mkspiffs-0.2.1-osx.tar.gz",
+              "checksum": "SHA-256:66e71f20d72fd7c5a75e016b5d88d51793558e68b0e069142dbe8ac1de30a431",
+              "size": "122716"
+            },
+            {
+              "host": "i386-apple-darwin",
+              "url": "https://github.com/igrr/mkspiffs/releases/download/0.2.1/mkspiffs-0.2.1-osx.tar.gz",
+              "archiveFileName": "mkspiffs-0.2.1-osx.tar.gz",
+              "checksum": "SHA-256:66e71f20d72fd7c5a75e016b5d88d51793558e68b0e069142dbe8ac1de30a431",
+              "size": "122716"
+            },
+            {
+              "host": "x86_64-pc-linux-gnu",
+              "url": "https://github.com/igrr/mkspiffs/releases/download/0.2.1/mkspiffs-0.2.1-linux64.tar.gz",
+              "archiveFileName": "mkspiffs-0.2.1-linux64.tar.gz",
+              "checksum": "SHA-256:cca5e947b4c953d4a2b15bae2cd69e052e20c6ac1975ec5d887596a37a24b41a",
+              "size": "49281"
+            },
+            {
+              "host": "i686-pc-linux-gnu",
+              "url": "https://github.com/igrr/mkspiffs/releases/download/0.2.1/mkspiffs-0.2.1-linux32.tar.gz",
+              "archiveFileName": "mkspiffs-0.2.1-linux32.tar.gz",
+              "checksum": "SHA-256:7ac82238f703ec97e2a1c2be65665cff055ad91fccf976ff34a95f63bb80a20a",
+              "size": "47944"
+            },
+            {
+              "host": "arm-linux-gnueabihf",
+              "url": "https://github.com/igrr/mkspiffs/releases/download/0.2.1/mkspiffs-0.2.1-linux-armhf.tar.gz",
+              "archiveFileName": "mkspiffs-0.2.1-linux-armhf.tar.gz",
+              "checksum": "SHA-256:2c2ae495502c054919ee03c9222eaf15fbdd3b45410129b5d978eb49845389c0",
+              "size": "43965"
+            }
+          ]
         }
       ]
     }