diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4bc5bf8..3d21c11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.25.1]
+
+### Fixed
+
+- The `EncodeLabelSet` and `EncodeLabelValue` derive macros now emit spanned
+  compile errors for invalid input instead of panicking, so diagnostics point at
+  the offending type or attribute rather than at the derive site. See [PR 307].
+
+### Changed
+
+- Updated `prometheus-client-derive-encode` to `v0.5.1`, which updates its `syn`
+  dependency to `v3`.
+
+[PR 307]: https://github.com/prometheus/client_rust/pull/307
+
 ## [0.25.0]
 
 ### Added
diff --git a/Cargo.lock b/Cargo.lock
index fc8066f..4aa2e8a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2489,7 +2489,7 @@ dependencies = [
 
 [[package]]
 name = "prometheus-client"
-version = "0.25.0"
+version = "0.25.1"
 dependencies = [
  "actix-web",
  "async-std",
@@ -2517,7 +2517,7 @@ dependencies = [
 
 [[package]]
 name = "prometheus-client-derive-encode"
-version = "0.5.0"
+version = "0.5.1"
 dependencies = [
  "proc-macro2",
  "prometheus-client",
diff --git a/Cargo.toml b/Cargo.toml
index ed2b974..c324241 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "prometheus-client"
-version = "0.25.0"
+version = "0.25.1"
 authors = ["Max Inden <mail@max-inden.de>"]
 edition = "2021"
 description = "Open Metrics client library allowing users to natively instrument applications."
@@ -31,7 +31,7 @@ members = ["derive-encode"]
 dtoa = "1.0"
 itoa = "1.0"
 parking_lot = "0.12"
-prometheus-client-derive-encode = { version = "0.5.0", path = "derive-encode" }
+prometheus-client-derive-encode = { version = "0.5.1", path = "derive-encode" }
 prost = { version = "0.14", optional = true }
 prost-types = { version = "0.14", optional = true }
 
diff --git a/derive-encode/Cargo.toml b/derive-encode/Cargo.toml
index 63941ac..e490361 100644
--- a/derive-encode/Cargo.toml
+++ b/derive-encode/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "prometheus-client-derive-encode"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Max Inden <mail@max-inden.de>"]
 edition = "2021"
 description = "Auxiliary crate to derive Encode trait from prometheus-client."