diff --git a/src/main.cpp b/src/main.cpp
index 97fc322..d4f48c0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,6 +3,7 @@
 #include <SD.h>
 #include <WiFi.h>
 #include <ESPmDNS.h>
+#include <SPIFFS.h>
 #include "config.h"
 #include "controller.h"
 #include "player.h"
@@ -41,13 +42,16 @@ void setup() {
 
 	DEBUG("Setting up SD card...\n");
 	spi->select_sd();
-	if (SD.begin(42)) {
+	if (SD.begin(42, SPI, 25000000)) {
 		INFO("SD card initialized.\n");
 	} else {
 		ERROR("Could not initialize SD card.\n");
 	}
 	spi->select_sd(false);
 
+	DEBUG("Starting SPIFFS...\n");
+	SPIFFS.begin(true);
+
 	DEBUG("Initializing PlaylistManager...\n");
 	pm = new PlaylistManager();
 	DEBUG("done.\n");