diff --git a/boards/OLIMEX_STM32_E407/board.h b/boards/OLIMEX_STM32_E407/board.h
index 16bfccdca..80c4bbdff 100644
--- a/boards/OLIMEX_STM32_E407/board.h
+++ b/boards/OLIMEX_STM32_E407/board.h
@@ -367,7 +367,7 @@
  * PB6  - PIN6                      (input pullup).
  * PB7  - PIN7                      (input pullup).
  * PB8  - I2C1_SCL                  (alternate 4).
- * PB9  - I2C1_SDA                  (alternate 0).
+ * PB9  - I2C1_SDA                  (alternate 4).
  * PB10 - SPI2_SCK                  (alternate 5).
  * PB11 - PIN11                     (input pullup).
  * PB12 - OTG_HS_ID                 (alternate 12).
@@ -464,7 +464,7 @@
                                      PIN_AFIO_AF(GPIOB_PIN6, 0) |           \
                                      PIN_AFIO_AF(GPIOB_PIN7, 0))
 #define VAL_GPIOB_AFRH              (PIN_AFIO_AF(GPIOB_I2C1_SCL, 4) |       \
-                                     PIN_AFIO_AF(GPIOB_I2C1_SDA, 0) |       \
+                                     PIN_AFIO_AF(GPIOB_I2C1_SDA, 4) |       \
                                      PIN_AFIO_AF(GPIOB_SPI2_SCK, 5) |       \
                                      PIN_AFIO_AF(GPIOB_PIN11, 0) |          \
                                      PIN_AFIO_AF(GPIOB_OTG_HS_ID, 12) |     \
diff --git a/boards/OLIMEX_STM32_E407/cfg/board.chcfg b/boards/OLIMEX_STM32_E407/cfg/board.chcfg
index 9f6805ba4..4d4abeb04 100644
--- a/boards/OLIMEX_STM32_E407/cfg/board.chcfg
+++ b/boards/OLIMEX_STM32_E407/cfg/board.chcfg
@@ -79,7 +79,7 @@
             <pin8 ID="I2C1_SCL" Type="OpenDrain" Speed="Maximum" Resistor="Floating"
                 Level="High" Mode="Alternate" Alternate="4" />
             <pin9 ID="I2C1_SDA" Type="OpenDrain" Speed="Maximum" Resistor="Floating"
-                Level="High" Mode="Alternate" Alternate="0" />
+                Level="High" Mode="Alternate" Alternate="4" />
             <pin10 ID="SPI2_SCK" Type="PushPull" Speed="Maximum" Resistor="Floating"
                 Level="High" Mode="Alternate" Alternate="5" />
             <pin11 ID="" Type="PushPull" Speed="Maximum" Resistor="PullUp"