diff --git a/ChangeLog b/ChangeLog
index af70571c9dc..d36ab0e7092 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7522,6 +7522,8 @@
 
 7.4 2014-xx-xx Gregory Nutt <gnutt@nuttx.org>
 
+	* arch/arm/src/stm32/stm32_i2c.c:  Fix missing configuration of
+	  GPIO pins in I2C driver.  Fix from Alex D. (2014-6-25).
 	* NET: Fix an include file ordering problem when CONFIG_NET_STATISTICS=y.
 	  (2014-6-26).
 
diff --git a/arch/arm/src/stm32/stm32_i2c.c b/arch/arm/src/stm32/stm32_i2c.c
index bc71324e8fd..4036f505623 100644
--- a/arch/arm/src/stm32/stm32_i2c.c
+++ b/arch/arm/src/stm32/stm32_i2c.c
@@ -2036,6 +2036,9 @@ int up_i2creset(FAR struct i2c_dev_s * dev)
   scl_gpio = MKI2C_OUTPUT(priv->config->scl_pin);
   sda_gpio = MKI2C_OUTPUT(priv->config->sda_pin);
 
+  stm32_configgpio(scl_gpio);
+  stm32_configgpio(sda_gpio);
+
   /* Let SDA go high */
 
   stm32_gpiowrite(sda_gpio, 1);