diff --git a/Cargo.toml b/Cargo.toml
index c71f4031..67be5b6d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,7 +24,6 @@ x86-sync-pool = []
 __trybuild = []
 # Enable larger MPMC sizes.
 mpmc_large = []
-defmt-impl = ["defmt"]
 
 [target.'cfg(any(target_arch = "x86_64", target_arch = "x86"))'.dev-dependencies]
 scoped_threadpool = "0.1.8"
@@ -35,6 +34,16 @@ atomic-polyfill = { version = "0.1.2", optional = true }
 [dependencies]
 hash32 = "0.2.1"
 
+[dependencies.defmt02]
+package = "defmt"
+version = "0.2"
+optional = true
+
+[dependencies.defmt03]
+package = "defmt"
+version = "0.3"
+optional = true
+
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 spin = "0.9.2"
 
@@ -54,10 +63,3 @@ optional = true
 [dev-dependencies.ufmt]
 version = "0.1"
 
-[dependencies.defmt]
-version = "0.2.1"
-optional = true
-
-[dev-dependencies.defmt]
-version = "0.2.1"
-features = ["unstable-test"]
diff --git a/src/defmt.rs b/src/defmt.rs
index c8a4ab82..058829b0 100644
--- a/src/defmt.rs
+++ b/src/defmt.rs
@@ -1,6 +1,10 @@
 //! Defmt implementations for heapless types
 //!
 
+#[cfg(feature = "defmt02")]
+use defmt02 as defmt;
+#[cfg(feature = "defmt03")]
+use defmt03 as defmt;
 use crate::Vec;
 use defmt::Formatter;
 
diff --git a/src/lib.rs b/src/lib.rs
index fe976f10..ca23e714 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -99,7 +99,7 @@ mod de;
 mod ser;
 
 pub mod binary_heap;
-#[cfg(feature = "defmt-impl")]
+#[cfg(any(feature = "defmt02", feature = "defmt03"))]
 mod defmt;
 #[cfg(all(has_cas, feature = "cas"))]
 pub mod mpmc;