diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cd8c3a6..5b7e099f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- [#865]: `defmt`: Replace proc-macro-error with proc-macro-error2
 - [#859]: `defmt`: Satisfy clippy
 - [#858]: `defmt`: Implement "passthrough" trait impls for *2Format wrappers
 - [#857]: Add an octal display hint (`:o`)
diff --git a/macros/Cargo.toml b/macros/Cargo.toml
index 3b784cf6..83c29245 100644
--- a/macros/Cargo.toml
+++ b/macros/Cargo.toml
@@ -18,7 +18,7 @@ unstable-test = []
 
 [dependencies]
 defmt-parser = { version = "=0.3.4", path = "../parser", features = ["unstable"] }
-proc-macro-error = "1"
+proc-macro-error2 = "2"
 proc-macro2 = "1"
 quote = "1"
 syn = { version = "2", features = ["full", "extra-traits"] }
diff --git a/macros/src/attributes/global_logger.rs b/macros/src/attributes/global_logger.rs
index 995bb6ce..99f87537 100644
--- a/macros/src/attributes/global_logger.rs
+++ b/macros/src/attributes/global_logger.rs
@@ -1,5 +1,5 @@
 use proc_macro::TokenStream;
-use proc_macro_error::{abort, abort_call_site};
+use proc_macro_error2::{abort, abort_call_site};
 use quote::quote;
 use syn::{parse_macro_input, Fields, ItemStruct};
 
diff --git a/macros/src/attributes/panic_handler.rs b/macros/src/attributes/panic_handler.rs
index e5537f47..6d1d3172 100644
--- a/macros/src/attributes/panic_handler.rs
+++ b/macros/src/attributes/panic_handler.rs
@@ -1,5 +1,5 @@
 use proc_macro::TokenStream;
-use proc_macro_error::{abort, abort_call_site};
+use proc_macro_error2::{abort, abort_call_site};
 use quote::quote;
 use syn::{parse_macro_input, Attribute, ItemFn, ReturnType, Type};
 
diff --git a/macros/src/derives/format.rs b/macros/src/derives/format.rs
index 52cc7027..4b122c0f 100644
--- a/macros/src/derives/format.rs
+++ b/macros/src/derives/format.rs
@@ -1,5 +1,5 @@
 use proc_macro::TokenStream;
-use proc_macro_error::abort_call_site;
+use proc_macro_error2::abort_call_site;
 use quote::quote;
 use syn::{parse_macro_input, Data, DeriveInput};
 
diff --git a/macros/src/derives/format/codegen/enum_data.rs b/macros/src/derives/format/codegen/enum_data.rs
index 6120e4fc..c8f83314 100644
--- a/macros/src/derives/format/codegen/enum_data.rs
+++ b/macros/src/derives/format/codegen/enum_data.rs
@@ -1,5 +1,5 @@
 use proc_macro2::TokenStream as TokenStream2;
-use proc_macro_error::abort_call_site;
+use proc_macro_error2::abort_call_site;
 use quote::quote;
 use syn::{DataEnum, Ident};
 
diff --git a/macros/src/function_like/log.rs b/macros/src/function_like/log.rs
index 7c51164e..3aefed7c 100644
--- a/macros/src/function_like/log.rs
+++ b/macros/src/function_like/log.rs
@@ -1,7 +1,7 @@
 use defmt_parser::{Level, ParserMode};
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
-use proc_macro_error::abort;
+use proc_macro_error2::abort;
 use quote::quote;
 use syn::parse_macro_input;
 
diff --git a/macros/src/function_like/log/codegen.rs b/macros/src/function_like/log/codegen.rs
index 5c0a9e00..9e159ed3 100644
--- a/macros/src/function_like/log/codegen.rs
+++ b/macros/src/function_like/log/codegen.rs
@@ -1,6 +1,6 @@
 use defmt_parser::{Fragment, Parameter, Type};
 use proc_macro2::{Ident as Ident2, Span as Span2, TokenStream as TokenStream2};
-use proc_macro_error::abort;
+use proc_macro_error2::abort;
 use quote::{format_ident, quote};
 
 pub(crate) struct Codegen {
diff --git a/macros/src/function_like/log/env_filter.rs b/macros/src/function_like/log/env_filter.rs
index ee8ab9c6..21b98e7f 100644
--- a/macros/src/function_like/log/env_filter.rs
+++ b/macros/src/function_like/log/env_filter.rs
@@ -5,7 +5,7 @@ use std::{
 
 use defmt_parser::Level;
 use proc_macro2::TokenStream as TokenStream2;
-use proc_macro_error::abort_call_site;
+use proc_macro_error2::abort_call_site;
 use quote::quote;
 
 use self::parse::{Entry, LogLevelOrOff, ModulePath};
diff --git a/macros/src/function_like/log/env_filter/parse.rs b/macros/src/function_like/log/env_filter/parse.rs
index 04a62898..9ee7a9c5 100644
--- a/macros/src/function_like/log/env_filter/parse.rs
+++ b/macros/src/function_like/log/env_filter/parse.rs
@@ -1,6 +1,6 @@
 use defmt_parser::Level;
 #[cfg(not(test))]
-use proc_macro_error::abort_call_site as panic;
+use proc_macro_error2::abort_call_site as panic;
 use std::fmt;
 use syn::Ident;
 
diff --git a/macros/src/function_like/println.rs b/macros/src/function_like/println.rs
index 767390ca..88ff2867 100644
--- a/macros/src/function_like/println.rs
+++ b/macros/src/function_like/println.rs
@@ -1,7 +1,7 @@
 use defmt_parser::ParserMode;
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
-use proc_macro_error::abort;
+use proc_macro_error2::abort;
 use quote::quote;
 use syn::parse_macro_input;
 
diff --git a/macros/src/function_like/write.rs b/macros/src/function_like/write.rs
index 8a59c262..ec154b90 100644
--- a/macros/src/function_like/write.rs
+++ b/macros/src/function_like/write.rs
@@ -1,6 +1,6 @@
 use defmt_parser::ParserMode;
 use proc_macro::TokenStream;
-use proc_macro_error::abort;
+use proc_macro_error2::abort;
 use quote::quote;
 use syn::parse_macro_input;
 
diff --git a/macros/src/items/timestamp.rs b/macros/src/items/timestamp.rs
index 7d0ba95a..9144e618 100644
--- a/macros/src/items/timestamp.rs
+++ b/macros/src/items/timestamp.rs
@@ -1,6 +1,6 @@
 use defmt_parser::ParserMode;
 use proc_macro::TokenStream;
-use proc_macro_error::abort;
+use proc_macro_error2::abort;
 use quote::format_ident;
 use quote::quote;
 use syn::parse_macro_input;
diff --git a/macros/src/lib.rs b/macros/src/lib.rs
index 991b5b72..19e6ca8a 100644
--- a/macros/src/lib.rs
+++ b/macros/src/lib.rs
@@ -5,7 +5,7 @@
 use defmt_parser::Level;
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
-use proc_macro_error::proc_macro_error;
+use proc_macro_error2::proc_macro_error;
 use quote::quote;
 
 mod attributes;