diff --git a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/.project b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/.project
index 745fa206e..c90a9d7c1 100644
--- a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/.project
+++ b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/.project
@@ -80,17 +80,17 @@
 		<link>
 			<name>board</name>
 			<type>2</type>
-      <locationURI>CHIBIOS/os/hal/boards/OLIMEX_STM32_E407</locationURI>
+			<locationURI>CHIBIOS/os/hal/boards/OLIMEX_STM32_E407</locationURI>
 		</link>
 		<link>
 			<name>fatfs</name>
 			<type>2</type>
-      <locationURI>CHIBIOS/os/ext/fatfs</locationURI>
+			<locationURI>CHIBIOS/ext/fatfs</locationURI>
 		</link>
 		<link>
 			<name>lwip</name>
 			<type>2</type>
-      <locationURI>CHIBIOS/os/ext/lwip</locationURI>
+			<locationURI>CHIBIOS/ext/lwip</locationURI>
 		</link>
 		<link>
 			<name>os</name>
diff --git a/os/various/fatfs_bindings/fatfs.mk b/os/various/fatfs_bindings/fatfs.mk
index 85c93263c..d395db860 100644
--- a/os/various/fatfs_bindings/fatfs.mk
+++ b/os/various/fatfs_bindings/fatfs.mk
@@ -1,7 +1,7 @@
 # FATFS files.
 FATFSSRC = ${CHIBIOS}/os/various/fatfs_bindings/fatfs_diskio.c \
            ${CHIBIOS}/os/various/fatfs_bindings/fatfs_syscall.c \
-           ${CHIBIOS}/os/ext/fatfs/src/ff.c \
-           ${CHIBIOS}/os/ext/fatfs/src/option/unicode.c
+           ${CHIBIOS}/ext/fatfs/src/ff.c \
+           ${CHIBIOS}/ext/fatfs/src/option/unicode.c
 
-FATFSINC = ${CHIBIOS}/os/ext/fatfs/src
+FATFSINC = ${CHIBIOS}/ext/fatfs/src
diff --git a/os/various/lwip_bindings/lwip.mk b/os/various/lwip_bindings/lwip.mk
index e2aa72d2f..afaaf1454 100644
--- a/os/various/lwip_bindings/lwip.mk
+++ b/os/various/lwip_bindings/lwip.mk
@@ -1,5 +1,5 @@
 # List of the required lwIP files.
-LWIP = 	${CHIBIOS}/os/ext/lwip
+LWIP = 	${CHIBIOS}/ext/lwip
 
 LWBINDSRC = \
         $(CHIBIOS)/os/various/lwip_bindings/lwipthread.c \