diff --git a/esp8266/Makefile b/esp8266/Makefile
index d63d5c255a..5e61fc16d8 100644
--- a/esp8266/Makefile
+++ b/esp8266/Makefile
@@ -133,8 +133,8 @@ LIB_SRC_C = $(addprefix lib/,\
 
 ifeq ($(MICROPY_FATFS), 1)
 LIB_SRC_C += \
-	lib/fatfs/ff.c \
-	lib/fatfs/option/ccsbcs.c
+	lib/oofatfs/ff.c \
+	lib/oofatfs/option/unicode.c
 endif
 
 DRIVERS_SRC_C = $(addprefix drivers/,\
diff --git a/esp8266/esp8266_common.ld b/esp8266/esp8266_common.ld
index d22a53865c..f721c28b03 100644
--- a/esp8266/esp8266_common.ld
+++ b/esp8266/esp8266_common.ld
@@ -113,7 +113,7 @@ SECTIONS
 
         *extmod/*.o*(.literal* .text*)
 
-        *lib/fatfs/*.o*(.literal*, .text*)
+        *lib/oofatfs/*.o*(.literal*, .text*)
         */libaxtls.a:(.literal*, .text*)
         *lib/berkeley-db-1.xx/*.o(.literal*, .text*)
         *lib/libm/*.o*(.literal*, .text*)
diff --git a/esp8266/mpconfigport.h b/esp8266/mpconfigport.h
index 0c4bda6bd2..952e6bec91 100644
--- a/esp8266/mpconfigport.h
+++ b/esp8266/mpconfigport.h
@@ -94,6 +94,7 @@
 #define MICROPY_MODULE_FROZEN_LEXER mp_lexer_new_from_str32
 #define MICROPY_QSTR_EXTRA_POOL     mp_qstr_frozen_const_pool
 
+#define MICROPY_FATFS_OO               (1)
 #define MICROPY_FATFS_ENABLE_LFN       (1)
 #define MICROPY_FATFS_RPATH            (2)
 #define MICROPY_FATFS_VOLUMES          (2)