diff --git a/src/i2c.rs b/src/i2c.rs
index ab919bb..61deb47 100644
--- a/src/i2c.rs
+++ b/src/i2c.rs
@@ -1,18 +1,11 @@
-#[cfg(feature = "stm32f042")]
+#[cfg(any(feature = "stm32f042", feature = "stm32f030"))]
 use crate::stm32::{I2C1, RCC};
 
 use embedded_hal::blocking::i2c::{Write, WriteRead};
 
-use core::cmp;
-#[cfg(feature = "stm32f042")]
-use crate::gpio::gpioa::{PA10, PA11, PA12, PA9};
-#[cfg(feature = "stm32f042")]
-use crate::gpio::gpiob::{PB10, PB11, PB13, PB14, PB6, PB7, PB8, PB9};
-#[cfg(feature = "stm32f042")]
-use crate::gpio::gpiof::{PF0, PF1};
-#[cfg(feature = "stm32f042")]
-use crate::gpio::{Alternate, AF1, AF4, AF5};
+use crate::gpio::*;
 use crate::time::{KiloHertz, U32Ext};
+use core::cmp;
 
 /// I2C abstraction
 pub struct I2c<I2C, PINS> {
@@ -22,20 +15,24 @@ pub struct I2c<I2C, PINS> {
 
 pub trait Pins<I2c> {}
 
-#[cfg(feature = "stm32f042")]
-impl Pins<I2C1> for (PA9<Alternate<AF4>>, PA10<Alternate<AF4>>) {}
-#[cfg(feature = "stm32f042")]
-impl Pins<I2C1> for (PA11<Alternate<AF5>>, PA12<Alternate<AF5>>) {}
-#[cfg(feature = "stm32f042")]
-impl Pins<I2C1> for (PB6<Alternate<AF1>>, PB7<Alternate<AF1>>) {}
-#[cfg(feature = "stm32f042")]
-impl Pins<I2C1> for (PB8<Alternate<AF1>>, PB9<Alternate<AF1>>) {}
-#[cfg(feature = "stm32f042")]
-impl Pins<I2C1> for (PB10<Alternate<AF1>>, PB11<Alternate<AF1>>) {}
-#[cfg(feature = "stm32f042")]
-impl Pins<I2C1> for (PB13<Alternate<AF5>>, PB14<Alternate<AF5>>) {}
-#[cfg(feature = "stm32f042")]
-impl Pins<I2C1> for (PF1<Alternate<AF1>>, PF0<Alternate<AF1>>) {}
+#[cfg(any(
+    feature = "stm32f042",
+    feature = "stm32f030x6",
+    feature = "stm32f030xc"
+))]
+impl Pins<I2C1> for (gpioa::PA9<Alternate<AF4>>, gpioa::PA10<Alternate<AF4>>) {}
+#[cfg(any(feature = "stm32f042", feature = "stm32f030"))]
+impl Pins<I2C1> for (gpioa::PA11<Alternate<AF5>>, gpioa::PA12<Alternate<AF5>>) {}
+#[cfg(any(feature = "stm32f042", feature = "stm32f030"))]
+impl Pins<I2C1> for (gpiob::PB6<Alternate<AF1>>, gpiob::PB7<Alternate<AF1>>) {}
+#[cfg(any(feature = "stm32f042", feature = "stm32f030"))]
+impl Pins<I2C1> for (gpiob::PB8<Alternate<AF1>>, gpiob::PB9<Alternate<AF1>>) {}
+#[cfg(any(feature = "stm32f042", feature = "stm32f030x6"))]
+impl Pins<I2C1> for (gpiob::PB10<Alternate<AF1>>, gpiob::PB11<Alternate<AF1>>) {}
+#[cfg(any(feature = "stm32f042", feature = "stm32f030xc"))]
+impl Pins<I2C1> for (gpiob::PB13<Alternate<AF5>>, gpiob::PB14<Alternate<AF5>>) {}
+#[cfg(any(feature = "stm32f042", feature = "stm32f030xc"))]
+impl Pins<I2C1> for (gpiof::PF1<Alternate<AF1>>, gpiof::PF0<Alternate<AF1>>) {}
 
 #[derive(Debug)]
 pub enum Error {
@@ -43,7 +40,7 @@ pub enum Error {
     NACK,
 }
 
-#[cfg(feature = "stm32f042")]
+#[cfg(any(feature = "stm32f042", feature = "stm32f030"))]
 impl<PINS> I2c<I2C1, PINS> {
     pub fn i2c1(i2c: I2C1, pins: PINS, speed: KiloHertz) -> Self
     where
@@ -136,7 +133,7 @@ impl<PINS> I2c<I2C1, PINS> {
     }
 }
 
-#[cfg(feature = "stm32f042")]
+#[cfg(any(feature = "stm32f042", feature = "stm32f030"))]
 impl<PINS> WriteRead for I2c<I2C1, PINS> {
     type Error = Error;
 
@@ -214,7 +211,7 @@ impl<PINS> WriteRead for I2c<I2C1, PINS> {
     }
 }
 
-#[cfg(feature = "stm32f042")]
+#[cfg(any(feature = "stm32f042", feature = "stm32f030"))]
 impl<PINS> Write for I2c<I2C1, PINS> {
     type Error = Error;