diff --git a/flight/PiOS/STM32F10x/pios_i2c.c b/flight/PiOS/STM32F10x/pios_i2c.c
index 90c208133..e1bdb44f8 100644
--- a/flight/PiOS/STM32F10x/pios_i2c.c
+++ b/flight/PiOS/STM32F10x/pios_i2c.c
@@ -891,6 +891,10 @@ int32_t PIOS_I2C_Init(uint32_t * i2c_id, const struct pios_i2c_adapter_cfg * cfg
 		break;
 	}
 
+	if (i2c_adapter->cfg->remap) {
+		GPIO_PinRemapConfig(i2c_adapter->cfg->remap, ENABLE);
+	}
+
 	/* Initialize the state machine */
 	i2c_adapter_fsm_init(i2c_adapter);
 
diff --git a/flight/PiOS/inc/pios_i2c_priv.h b/flight/PiOS/inc/pios_i2c_priv.h
index 5834fef34..a10fe0603 100644
--- a/flight/PiOS/inc/pios_i2c_priv.h
+++ b/flight/PiOS/inc/pios_i2c_priv.h
@@ -37,6 +37,7 @@ struct pios_i2c_adapter_cfg {
 	uint32_t transfer_timeout_ms;
 	struct stm32_gpio scl;
 	struct stm32_gpio sda;
+	uint32_t remap;
 	struct stm32_irq event;
 	struct stm32_irq error;
 };