diff --git a/litex/soc/software/bios/boot.c b/litex/soc/software/bios/boot.c
index 19d1284c9..3ea1d9534 100644
--- a/litex/soc/software/bios/boot.c
+++ b/litex/soc/software/bios/boot.c
@@ -30,7 +30,7 @@
 
 #include <liblitesdcard/spisdcard.h>
 #include <liblitesdcard/sdcard.h>
-#include <liblitesdcard/ff.h>
+#include <liblitesdcard/fat/ff.h>
 
 extern void boot_helper(unsigned long r1, unsigned long r2, unsigned long r3, unsigned long addr);
 
diff --git a/litex/soc/software/liblitesdcard/Makefile b/litex/soc/software/liblitesdcard/Makefile
index 6c0488ded..8c409f40f 100644
--- a/litex/soc/software/liblitesdcard/Makefile
+++ b/litex/soc/software/liblitesdcard/Makefile
@@ -14,6 +14,9 @@ liblitesdcard.a: $(OBJECTS)
 %.o: $(LIBLITESDCARD_DIRECTORY)/%.c
 	$(compile)
 
+%.o: $(LIBLITESDCARD_DIRECTORY)/fat/%.c
+	$(compile)
+
 %.o: %.S
 	$(assemble)
 
diff --git a/litex/soc/software/liblitesdcard/diskio.h b/litex/soc/software/liblitesdcard/fat/diskio.h
similarity index 100%
rename from litex/soc/software/liblitesdcard/diskio.h
rename to litex/soc/software/liblitesdcard/fat/diskio.h
diff --git a/litex/soc/software/liblitesdcard/ff.c b/litex/soc/software/liblitesdcard/fat/ff.c
similarity index 100%
rename from litex/soc/software/liblitesdcard/ff.c
rename to litex/soc/software/liblitesdcard/fat/ff.c
diff --git a/litex/soc/software/liblitesdcard/ff.h b/litex/soc/software/liblitesdcard/fat/ff.h
similarity index 100%
rename from litex/soc/software/liblitesdcard/ff.h
rename to litex/soc/software/liblitesdcard/fat/ff.h
diff --git a/litex/soc/software/liblitesdcard/ffconf.h b/litex/soc/software/liblitesdcard/fat/ffconf.h
similarity index 100%
rename from litex/soc/software/liblitesdcard/ffconf.h
rename to litex/soc/software/liblitesdcard/fat/ffconf.h
diff --git a/litex/soc/software/liblitesdcard/ffunicode.c b/litex/soc/software/liblitesdcard/fat/ffunicode.c
similarity index 100%
rename from litex/soc/software/liblitesdcard/ffunicode.c
rename to litex/soc/software/liblitesdcard/fat/ffunicode.c
diff --git a/litex/soc/software/liblitesdcard/spisdcard.c b/litex/soc/software/liblitesdcard/spisdcard.c
index 6b10ff168..9b66f7021 100644
--- a/litex/soc/software/liblitesdcard/spisdcard.c
+++ b/litex/soc/software/liblitesdcard/spisdcard.c
@@ -12,8 +12,8 @@
 #include <generated/mem.h>
 #include <system.h>
 
-#include "ff.h"
-#include "diskio.h"
+#include "fat/ff.h"
+#include "fat/diskio.h"
 #include "spisdcard.h"
 
 #ifdef CSR_SPISDCARD_BASE