diff --git a/CMake/Modules/CHIBIOS_STM32F4xx_sources.cmake b/CMake/Modules/CHIBIOS_STM32F4xx_sources.cmake
index 2492e31bde..e63aa328b7 100644
--- a/CMake/Modules/CHIBIOS_STM32F4xx_sources.cmake
+++ b/CMake/Modules/CHIBIOS_STM32F4xx_sources.cmake
@@ -65,7 +65,11 @@ foreach(SRC_FILE ${CHIBIOS_PORT_SRCS})
             ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DACv1
             ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DMAv2
             ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/GPIOv2
-            if(${CHIBIOS_BOARD} STREQUAL "ST_STM32F429I_DISCOVERY" OR ${CHIBIOS_BOARD} STREQUAL "ST_STM32F4_DISCOVERY" OR ${CHIBIOS_BOARD} STREQUAL "MBN_QUAIL" OR ${CHIBIOS_BOARD} STREQUAL "NETDUINO3_WIFI")
+            if(${CHIBIOS_BOARD} STREQUAL "ST_STM32F429I_DISCOVERY" OR 
+               ${CHIBIOS_BOARD} STREQUAL "ST_STM32F4_DISCOVERY" OR 
+               ${CHIBIOS_BOARD} STREQUAL "MBN_QUAIL" OR 
+               ${CHIBIOS_BOARD} STREQUAL "NETDUINO3_WIFI" OR
+               ${CHIBIOS_BOARD} STREQUAL "I2M_ELECTRON_NF")
                 ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/I2Cv1
             else()
                 ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/I2Cv2
@@ -96,7 +100,11 @@ list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/por
 list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DACv1)
 list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DMAv2)
 list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/GPIOv2)
-if(${CHIBIOS_BOARD} STREQUAL "ST_STM32F429I_DISCOVERY" OR ${CHIBIOS_BOARD} STREQUAL "ST_STM32F4_DISCOVERY" OR ${CHIBIOS_BOARD} STREQUAL "MBN_QUAIL" OR ${CHIBIOS_BOARD} STREQUAL "NETDUINO3_WIFI")
+if(${CHIBIOS_BOARD} STREQUAL "ST_STM32F429I_DISCOVERY" OR 
+   ${CHIBIOS_BOARD} STREQUAL "ST_STM32F4_DISCOVERY" OR 
+   ${CHIBIOS_BOARD} STREQUAL "MBN_QUAIL" OR 
+   ${CHIBIOS_BOARD} STREQUAL "NETDUINO3_WIFI" OR
+   ${CHIBIOS_BOARD} STREQUAL "I2M_ELECTRON_NF")
     list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/I2Cv1)
 else()
     list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/I2Cv2)