diff --git a/Cargo.toml b/Cargo.toml
index 9054bc2..840572f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,6 +17,7 @@ embedded-nal = "0.6.0"
 bit_field = "0.10.1"
 derive-try-from-primitive = "1"
 nb = "1.0.0"
+defmt = { version = "0.3", optional = true }
 
 [features]
 no-chip-version-assertion = []
diff --git a/src/host/dhcp.rs b/src/host/dhcp.rs
index f792736..521a831 100644
--- a/src/host/dhcp.rs
+++ b/src/host/dhcp.rs
@@ -4,7 +4,7 @@ use crate::MacAddress;
 
 pub struct Dhcp {
     // settings: HostConfig,
-// current: HostConfig,
+    // current: HostConfig,
 }
 
 impl Dhcp {
diff --git a/src/socket.rs b/src/socket.rs
index 2da445c..2a9d794 100644
--- a/src/socket.rs
+++ b/src/socket.rs
@@ -2,6 +2,8 @@ use crate::bus::Bus;
 use crate::register::socketn;
 use embedded_nal::Ipv4Addr;
 
+#[derive(Debug)]
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct Socket {
     pub index: u8,
     register: u8,
diff --git a/src/udp.rs b/src/udp.rs
index cc5ee6b..3e29388 100644
--- a/src/udp.rs
+++ b/src/udp.rs
@@ -6,6 +6,8 @@ use crate::socket::Socket;
 use core::fmt::Debug;
 use embedded_nal::{nb, IpAddr, Ipv4Addr, SocketAddr, SocketAddrV4, UdpClientStack, UdpFullStack};
 
+#[derive(Debug)]
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct UdpSocket {
     socket: Socket,
 }
@@ -140,10 +142,11 @@ impl UdpSocket {
 }
 
 #[derive(Debug)]
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum UdpSocketError<E: Debug> {
     NoMoreSockets,
     UnsupportedAddress,
-    Other(E),
+    Other(#[cfg_attr(feature = "defmt", defmt(Debug2Format))] E),
     WriteTimeout,
 }