diff --git a/.changes/audio-buffer b/.changes/audio-buffer
deleted file mode 100644
index 39812c8f..00000000
--- a/.changes/audio-buffer
+++ /dev/null
@@ -1 +0,0 @@
-patch type="added" "Pre-connect audio buffering"
diff --git a/.changes/dc-reliability b/.changes/dc-reliability
deleted file mode 100644
index dbbf82dc..00000000
--- a/.changes/dc-reliability
+++ /dev/null
@@ -1 +0,0 @@
-patch type="changed" "Improve reliable data channel buffering, sequencing, and add integration tests"
diff --git a/.changes/event-logging-trace b/.changes/event-logging-trace
deleted file mode 100644
index 6808f48c..00000000
--- a/.changes/event-logging-trace
+++ /dev/null
@@ -1 +0,0 @@
-patch type="changed" "Add event logging with public/internal tagging"
diff --git a/.changes/fix-linux-audio-processing b/.changes/fix-linux-audio-processing
deleted file mode 100644
index 75c9f9da..00000000
--- a/.changes/fix-linux-audio-processing
+++ /dev/null
@@ -1 +0,0 @@
-patch type="changed" "Enabled software AEC/NS/AGC for linux"
diff --git a/.changes/flutter-lint-warnings b/.changes/flutter-lint-warnings
deleted file mode 100644
index 8035ecd3..00000000
--- a/.changes/flutter-lint-warnings
+++ /dev/null
@@ -1 +0,0 @@
-patch type="changed" "Re-enable Flutter lint warnings and fix existing issues"
diff --git a/.changes/json-serializable b/.changes/json-serializable
deleted file mode 100644
index fb5fdad9..00000000
--- a/.changes/json-serializable
+++ /dev/null
@@ -1 +0,0 @@
-patch type="changed" "Migrate manual json serialization to json_serializable code generation"
diff --git a/.changes/pending-track-queue b/.changes/pending-track-queue
deleted file mode 100644
index 4b38921b..00000000
--- a/.changes/pending-track-queue
+++ /dev/null
@@ -1 +0,0 @@
-patch type="fixed" "race condition with pending tracks"
diff --git a/.changes/token-source b/.changes/token-source
deleted file mode 100644
index 3f532304..00000000
--- a/.changes/token-source
+++ /dev/null
@@ -1 +0,0 @@
-patch type="added" "Token source API with caching, endpoint helpers"
diff --git a/.version b/.version
index aedc15bb..fe16b348 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.5.3
+2.5.4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a703c25c..060a7807 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 2.5.4
+
+* Added pre-connect audio buffering
+* Added token source API with caching and endpoint helpers
+* Enabled software AEC/NS/AGC for Linux
+* Added event logging with public/internal tagging
+* Migrated manual JSON serialization to json_serializable code generation
+* Re-enabled Flutter lint warnings and fixed existing issues
+* Improved reliable data channel buffering, sequencing, and added integration tests
+* Fixed race condition with pending tracks
+
 ## 2.5.3
 
 * Feat: Data Packet Cryptor (#873)
diff --git a/ios/livekit_client.podspec b/ios/livekit_client.podspec
index 395a88a4..e99f388d 100644
--- a/ios/livekit_client.podspec
+++ b/ios/livekit_client.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                = 'livekit_client'
-  s.version             = '2.5.3'
+  s.version             = '2.5.4'
   s.summary             = 'Open source platform for real-time audio and video.'
   s.description         = 'Open source platform for real-time audio and video.'
   s.homepage            = 'https://livekit.io/'
diff --git a/lib/src/livekit.dart b/lib/src/livekit.dart
index 9a7dba07..fcf16840 100644
--- a/lib/src/livekit.dart
+++ b/lib/src/livekit.dart
@@ -20,7 +20,7 @@ import 'support/platform.dart' show lkPlatformIsMobile;
 /// Main entry point to connect to a room.
 /// {@category Room}
 class LiveKitClient {
-  static const version = '2.5.3';
+  static const version = '2.5.4';
 
   /// Initialize the WebRTC plugin. If this is not manually called, will be
   /// initialized with default settings.
diff --git a/macos/livekit_client.podspec b/macos/livekit_client.podspec
index e9465c93..87931b35 100644
--- a/macos/livekit_client.podspec
+++ b/macos/livekit_client.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                = 'livekit_client'
-  s.version             = '2.5.3'
+  s.version             = '2.5.4'
   s.summary             = 'Open source platform for real-time audio and video.'
   s.description         = 'Open source platform for real-time audio and video.'
   s.homepage            = 'https://livekit.io/'
diff --git a/pubspec.yaml b/pubspec.yaml
index bafa13f3..ef1b3b66 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,7 +15,7 @@
 name: livekit_client
 description: Flutter Client SDK for LiveKit.
   Build real-time video and audio into your apps. Supports iOS, Android, and Web.
-version: 2.5.3
+version: 2.5.4
 homepage: https://github.com/livekit/client-sdk-flutter
 
 environment: