diff --git a/embassy-stm32/src/rcc/f0/mod.rs b/embassy-stm32/src/rcc/f0/mod.rs
index 8ddacb8ef..870fe42cf 100644
--- a/embassy-stm32/src/rcc/f0/mod.rs
+++ b/embassy-stm32/src/rcc/f0/mod.rs
@@ -205,8 +205,9 @@ impl<'d> Rcc<'d> {
         Clocks {
             sys: Hertz(real_sysclk),
             apb1: Hertz(pclk),
+            apb2: Hertz(pclk),
             apb1_tim: Hertz(pclk * timer_mul),
-            apb2_tim: Hertz(0),
+            apb2_tim: Hertz(pclk * timer_mul),
             ahb: Hertz(hclk),
         }
     }
diff --git a/embassy-stm32/src/rcc/mod.rs b/embassy-stm32/src/rcc/mod.rs
index 91e8b5bef..c7d1ae615 100644
--- a/embassy-stm32/src/rcc/mod.rs
+++ b/embassy-stm32/src/rcc/mod.rs
@@ -9,8 +9,6 @@ mod types;
 pub struct Clocks {
     pub sys: Hertz,
     pub apb1: Hertz,
-
-    #[cfg(not(any(rcc_f0, rcc_f0x0)))]
     pub apb2: Hertz,
 
     pub apb1_tim: Hertz,
diff --git a/stm32-data b/stm32-data
index d7caa63b0..409ed5502 160000
--- a/stm32-data
+++ b/stm32-data
@@ -1 +1 @@
-Subproject commit d7caa63b0091f38af6657ec86b868bfa2e8a7b56
+Subproject commit 409ed5502c254e462f3e31b0ea5ddee95f818a70