diff --git a/components/spiffs/component.mk b/components/spiffs/component.mk
new file mode 100644
index 00000000..b470ed48
--- /dev/null
+++ b/components/spiffs/component.mk
@@ -0,0 +1,6 @@
+#
+# Component Makefile
+#
+COMPONENT_ADD_INCLUDEDIRS := include
+
+COMPONENT_SRCDIRS := library
diff --git a/include/espressif/esp_spiffs.h b/components/spiffs/include/esp_spiffs.h
similarity index 100%
rename from include/espressif/esp_spiffs.h
rename to components/spiffs/include/esp_spiffs.h
diff --git a/include/spiffs/spiffs.h b/components/spiffs/include/spiffs.h
similarity index 100%
rename from include/spiffs/spiffs.h
rename to components/spiffs/include/spiffs.h
diff --git a/include/spiffs/spiffs_config.h b/components/spiffs/include/spiffs_config.h
similarity index 100%
rename from include/spiffs/spiffs_config.h
rename to components/spiffs/include/spiffs_config.h
diff --git a/include/spiffs/spiffs_nucleus.h b/components/spiffs/include/spiffs_nucleus.h
similarity index 100%
rename from include/spiffs/spiffs_nucleus.h
rename to components/spiffs/include/spiffs_nucleus.h
diff --git a/third_party/spiffs/esp_spiffs.c b/components/spiffs/library/esp_spiffs.c
similarity index 100%
rename from third_party/spiffs/esp_spiffs.c
rename to components/spiffs/library/esp_spiffs.c
diff --git a/third_party/spiffs/spiffs_cache.c b/components/spiffs/library/spiffs_cache.c
similarity index 100%
rename from third_party/spiffs/spiffs_cache.c
rename to components/spiffs/library/spiffs_cache.c
diff --git a/third_party/spiffs/spiffs_check.c b/components/spiffs/library/spiffs_check.c
similarity index 100%
rename from third_party/spiffs/spiffs_check.c
rename to components/spiffs/library/spiffs_check.c
diff --git a/third_party/spiffs/spiffs_gc.c b/components/spiffs/library/spiffs_gc.c
similarity index 100%
rename from third_party/spiffs/spiffs_gc.c
rename to components/spiffs/library/spiffs_gc.c
diff --git a/third_party/spiffs/spiffs_hydrogen.c b/components/spiffs/library/spiffs_hydrogen.c
similarity index 100%
rename from third_party/spiffs/spiffs_hydrogen.c
rename to components/spiffs/library/spiffs_hydrogen.c
diff --git a/third_party/spiffs/spiffs_nucleus.c b/components/spiffs/library/spiffs_nucleus.c
similarity index 100%
rename from third_party/spiffs/spiffs_nucleus.c
rename to components/spiffs/library/spiffs_nucleus.c
diff --git a/include/espressif/esp_common.h b/include/espressif/esp_common.h
index 7596201a..8f285625 100644
--- a/include/espressif/esp_common.h
+++ b/include/espressif/esp_common.h
@@ -100,7 +100,6 @@
 #include "esp_system.h"
 #include "esp_timer.h"
 #include "esp_ssc.h"
-#include "esp_spiffs.h"
 
 #include "esp8266/esp8266.h"
 
diff --git a/third_party/spiffs/Makefile b/third_party/spiffs/Makefile
deleted file mode 100644
index ad8d7a28..00000000
--- a/third_party/spiffs/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-
-#############################################################
-# Required variables for each makefile
-# Discard this section from all parent makefiles
-# Expected variables (with automatic defaults):
-#   CSRCS (all "C" files in the dir)
-#   SUBDIRS (all subdirs with a Makefile)
-#   GEN_LIBS - list of libs to be generated ()
-#   GEN_IMAGES - list of images to be generated ()
-#   COMPONENTS_xxx - a list of libs/objs in the form
-#     subdir/lib to be extracted and rolled up into
-#     a generated lib/image xxx.a ()
-#
-ifndef PDIR
-GEN_LIBS = libspiffs.a
-endif
-
-
-#############################################################
-# Configuration i.e. compile options etc.
-# Target specific stuff (defines etc.) goes in here!
-# Generally values applying to a tree are captured in the
-#   makefile at its root level - these are then overridden
-#   for a subtree within the makefile rooted therein
-#
-#DEFINES += 
-
-#############################################################
-# Recursion Magic - Don't touch this!!
-#
-# Each subtree potentially has an include directory
-#   corresponding to the common APIs applicable to modules
-#   rooted at that subtree. Accordingly, the INCLUDE PATH
-#   of a module can only contain the include directories up
-#   its parent path, and not its siblings
-#
-# Required for each makefile to inherit from the parent
-#
-
-INCLUDES := $(INCLUDES) -I $(PDIR)include
-INCLUDES += -I ./
-PDIR := ../$(PDIR)
-sinclude $(PDIR)Makefile
-