diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61c4d4c681d..7baa6c42512 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,6 @@
 
 ### Features
 
-* Sync Lock: End of track checking is not needed [#11035](https://github.com/mixxxdj/mixxx/pull/11035)
 * BaseExternalLibraryFeature: Add ability to import external playlists as crates [#11852](https://github.com/mixxxdj/mixxx/pull/11852)
 * Logging: Include timestamps in messages by default [#11861](https://github.com/mixxxdj/mixxx/pull/11861)
 * DlgPrefSound: Fix fetching of sample rate [#11951](https://github.com/mixxxdj/mixxx/pull/11951) [11949](https://github.com/mixxxdj/mixxx/issues/11949)
@@ -14,16 +13,23 @@
 * Playlist feature: add 'Shuffle playlist' sidebar action [#12498](https://github.com/mixxxdj/mixxx/pull/12498)
 * New built-in effect: Glitch [#11329](https://github.com/mixxxdj/mixxx/pull/11329)
 * Fullscreen toggle rework [#11566](https://github.com/mixxxdj/mixxx/pull/11566)
+* Playlists: Update of playlist labels after adding tracks [#12866](https://github.com/mixxxdj/mixxx/pull/12866) [#12761](https://github.com/mixxxdj/mixxx/issues/12761)
+* Tracks: Custom text color for played tracks (qss) [#12744](https://github.com/mixxxdj/mixxx/pull/12744) [#5911](https://github.com/mixxxdj/mixxx/issues/5911) [#12912](https://github.com/mixxxdj/mixxx/pull/12912)
+* History: Show track count and duration in sidebar [#12811](https://github.com/mixxxdj/mixxx/pull/12811) [#12788](https://github.com/mixxxdj/mixxx/issues/12788)
+* fixes around cratetablemodel, remove tracks + don't allow pasting tracks into locked playlists/crates or History [#12926](https://github.com/mixxxdj/mixxx/pull/12926)
+* Tootips: Improve `rate_up/down` tooltips, pitch vs. speed [#12590](https://github.com/mixxxdj/mixxx/pull/12590)
+* Shortkeys for track list management [#12020](https://github.com/mixxxdj/mixxx/pull/12020)
+* Track menu: Rephrase "Reset" to "Clear" [#12955](https://github.com/mixxxdj/mixxx/pull/12955)
 
 ### Controller Mappings
 
-* Traktor Kontrol S2 MK3: Add colored hotcues [#4637](https://github.com/mixxxdj/mixxx/pull/4637)
 * Pioneer DDJ-FLX4: mapping improvements [#12842](https://github.com/mixxxdj/mixxx/pull/12842)
 
 ### Controller Backend
 
 * Send sysex to all handlers [#12827](https://github.com/mixxxdj/mixxx/pull/12827)
 * Add control for showing a deck's track menu [#10825](https://github.com/mixxxdj/mixxx/pull/10825)
+* Removed old examples HID keyboard and HID trackpad [#12977](https://github.com/mixxxdj/mixxx/pull/12977)
 
 ### Experimental QML Skin
 
@@ -34,6 +40,8 @@
 * fix(qml): Improve knobs by applying selective 4xMSAA on the Arc shape [#12541](https://github.com/mixxxdj/mixxx/pull/12541)
 * Add QML interceptor to auto reload on file change [#12795](https://github.com/mixxxdj/mixxx/pull/12795)
 * Add multi-sampling settings for QML [#12546](https://github.com/mixxxdj/mixxx/pull/12546) [#12794](https://github.com/mixxxdj/mixxx/pull/12794) [#12536](https://github.com/mixxxdj/mixxx/issues/12536)
+* Install qml module on Windows [#12604](https://github.com/mixxxdj/mixxx/pull/12604)
+* Add scrolling waveforms [#3967](https://github.com/mixxxdj/mixxx/pull/3967)
 
 ### Update to Qt6
 
@@ -59,6 +67,7 @@
 * Fix track color background with Qt6 [#12380](https://github.com/mixxxdj/mixxx/pull/12380)
 * multi-line delegate: fix bg color, Qt6 on Linux [#12478](https://github.com/mixxxdj/mixxx/pull/12478)
 * Revert "BaseTrackPlayer: Remove references to WaveformWidgetRenderer when using Qt6" [#12342](https://github.com/mixxxdj/mixxx/pull/12342)
+* Fix Tango waveform splitter [#12939](https://github.com/mixxxdj/mixxx/pull/12939)
 
 ### Experimental iOs support
 
@@ -78,6 +87,20 @@
 * MacOsVersion: Rename to AppleOsVersion [#12662](https://github.com/mixxxdj/mixxx/pull/12662)
 * macOS: Add more `Q_OS_MACOS` cond-compiles where appropriate [#12663](https://github.com/mixxxdj/mixxx/pull/12663)
 
+### Experimental WebAssembly support
+
+* CMakeLists: Add support for targeting Emscripten/WebAssembly [#12918](https://github.com/mixxxdj/mixxx/pull/12918)
+* CMakeLists: Emit better errors for exotic target platforms [#12910](https://github.com/mixxxdj/mixxx/pull/12910)
+* Build: Add `PORTMIDI` flag for compiling with(out) PortMidi [#12913](https://github.com/mixxxdj/mixxx/pull/12913)
+* DesktopHelper: Compile out process-spawning on WASM too [#12916](https://github.com/mixxxdj/mixxx/pull/12916)
+* MixxxApplication: Use `QWasmIntegrationPlugin` when targeting WebAssembly [#12915](https://github.com/mixxxdj/mixxx/pull/12915)
+* CMakeLists: Enable asyncify when targeting WASM [#12921](https://github.com/mixxxdj/mixxx/pull/12921)
+* Resources: Bundle resources for preloading when targeting Emscripten/WASM [#12922](https://github.com/mixxxdj/mixxx/pull/12922)
+* CMakeLists: Add `WASM_ASSERTIONS` option [#12931](https://github.com/mixxxdj/mixxx/pull/12931)
+* VersionStore: Recognize Emscripten/WebAssembly [#12940](https://github.com/mixxxdj/mixxx/pull/12940)
+* OpenGLWindow: Fix sizing on Wasm by setting `Qt::FramelessWindowHint` [#12945](https://github.com/mixxxdj/mixxx/pull/12945)
+* CMakeLists: Require WebGL 2.0 when building for Wasm [#12952](https://github.com/mixxxdj/mixxx/pull/12952)
+
 ### Misc Refactorings
 
 * Add missing `<Qt>` include in `defs.h` [#11348](https://github.com/mixxxdj/mixxx/pull/11348)
@@ -111,10 +134,21 @@
 * fix/History: remove obsolete placeholder playlists [#12494](https://github.com/mixxxdj/mixxx/pull/12494)
 * Add missing Taglib dependency [#12830](https://github.com/mixxxdj/mixxx/pull/12830)
 * fix: typo ;) [#12726](https://github.com/mixxxdj/mixxx/pull/12726)
+* refactor: Avoid temporary qlist allocation on midi sysex receive [#12843](https://github.com/mixxxdj/mixxx/pull/12843)
+* SoundSourceMP3: fix unused function warning [#12847](https://github.com/mixxxdj/mixxx/pull/12847)
+* update libkeyfinder to 2.2.8 [#12853](https://github.com/mixxxdj/mixxx/pull/12853)
+* feat(ci): Add eslint rule prefer-template [#12889](https://github.com/mixxxdj/mixxx/pull/12889)
+* Labeler: Add `qml` to labeler config [#12911](https://github.com/mixxxdj/mixxx/pull/12911)
+* WTrackMenu: Add missing wcoverartlabel.h include [#12924](https://github.com/mixxxdj/mixxx/pull/12924)
+* Fix clazy complains and naming [#12935](https://github.com/mixxxdj/mixxx/pull/12935)
+* src/library: Sort files into sub-directories [#12956](https://github.com/mixxxdj/mixxx/pull/12956)
+* CMakeLists: Fix deduplication trap with `--preload-file` [#12944](https://github.com/mixxxdj/mixxx/pull/12944)
+* Add CI runner that allows cleaning up the download server [#12957](https://github.com/mixxxdj/mixxx/pull/12957)
 * Update to latest vcpkg dependencies
   [#11649](https://github.com/mixxxdj/mixxx/pull/11649)
   [#12512](https://github.com/mixxxdj/mixxx/pull/12512)
   [#12067](https://github.com/mixxxdj/mixxx/pull/12067)
+  [#12898](https://github.com/mixxxdj/mixxx/pull/12898)
 * GitHub actions updates
   [#11544](https://github.com/mixxxdj/mixxx/pull/11544)
   [#11508](https://github.com/mixxxdj/mixxx/pull/11508)
diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
index 4e57e1a4d18..1a9711247f8 100644
--- a/res/linux/org.mixxx.Mixxx.metainfo.xml
+++ b/res/linux/org.mixxx.Mixxx.metainfo.xml
@@ -96,16 +96,12 @@
   Do not edit it manually.
   -->
   <releases>
-    <release version="2.5.0" type="development" date="2024-02-23" timestamp="1708721847">
+    <release version="2.5.0" type="development" date="2024-03-18" timestamp="1710747808">
       <description>
  <p>
   Features
  </p>
  <ul>
-  <li>
-   Sync Lock: End of track checking is not needed
-   #11035
-  </li>
   <li>
    BaseExternalLibraryFeature: Add ability to import external playlists as crates
    #11852
@@ -143,15 +139,45 @@
    Fullscreen toggle rework
    #11566
   </li>
+  <li>
+   Playlists: Update of playlist labels after adding tracks
+   #12866
+   #12761
+  </li>
+  <li>
+   Tracks: Custom text color for played tracks (qss)
+   #12744
+   #5911
+   #12912
+  </li>
+  <li>
+   History: Show track count and duration in sidebar
+   #12811
+   #12788
+  </li>
+  <li>
+   fixes around cratetablemodel, remove tracks + don't allow pasting tracks into locked playlists/crates or History
+   #12926
+  </li>
+  <li>
+   Tootips: Improve
+   rate_up/down
+   tooltips, pitch vs. speed
+   #12590
+  </li>
+  <li>
+   Shortkeys for track list management
+   #12020
+  </li>
+  <li>
+   Track menu: Rephrase "Reset" to "Clear"
+   #12955
+  </li>
  </ul>
  <p>
   Controller Mappings
  </p>
  <ul>
-  <li>
-   Traktor Kontrol S2 MK3: Add colored hotcues
-   #4637
-  </li>
   <li>
    Pioneer DDJ-FLX4: mapping improvements
    #12842
@@ -169,6 +195,10 @@
    Add control for showing a deck's track menu
    #10825
   </li>
+  <li>
+   Removed old examples HID keyboard and HID trackpad
+   #12977
+  </li>
  </ul>
  <p>
   Experimental QML Skin
@@ -207,6 +237,14 @@
    #12794
    #12536
   </li>
+  <li>
+   Install qml module on Windows
+   #12604
+  </li>
+  <li>
+   Add scrolling waveforms
+   #3967
+  </li>
  </ul>
  <p>
   Update to Qt6
@@ -300,6 +338,10 @@
    Revert "BaseTrackPlayer: Remove references to WaveformWidgetRenderer when using Qt6"
    #12342
   </li>
+  <li>
+   Fix Tango waveform splitter
+   #12939
+  </li>
  </ul>
  <p>
   Experimental iOs support
@@ -370,6 +412,62 @@
    #12663
   </li>
  </ul>
+ <p>
+  Experimental WebAssembly support
+ </p>
+ <ul>
+  <li>
+   CMakeLists: Add support for targeting Emscripten/WebAssembly
+   #12918
+  </li>
+  <li>
+   CMakeLists: Emit better errors for exotic target platforms
+   #12910
+  </li>
+  <li>
+   Build: Add
+   PORTMIDI
+   flag for compiling with(out) PortMidi
+   #12913
+  </li>
+  <li>
+   DesktopHelper: Compile out process-spawning on WASM too
+   #12916
+  </li>
+  <li>
+   MixxxApplication: Use
+   QWasmIntegrationPlugin
+   when targeting WebAssembly
+   #12915
+  </li>
+  <li>
+   CMakeLists: Enable asyncify when targeting WASM
+   #12921
+  </li>
+  <li>
+   Resources: Bundle resources for preloading when targeting Emscripten/WASM
+   #12922
+  </li>
+  <li>
+   CMakeLists: Add
+   WASM_ASSERTIONS
+   option
+   #12931
+  </li>
+  <li>
+   VersionStore: Recognize Emscripten/WebAssembly
+   #12940
+  </li>
+  <li>
+   OpenGLWindow: Fix sizing on Wasm by setting
+   Qt::FramelessWindowHint
+   #12945
+  </li>
+  <li>
+   CMakeLists: Require WebGL 2.0 when building for Wasm
+   #12952
+  </li>
+ </ul>
  <p>
   Misc Refactorings
  </p>
@@ -519,11 +617,55 @@
    fix: typo ;)
    #12726
   </li>
+  <li>
+   refactor: Avoid temporary qlist allocation on midi sysex receive
+   #12843
+  </li>
+  <li>
+   SoundSourceMP3: fix unused function warning
+   #12847
+  </li>
+  <li>
+   update libkeyfinder to 2.2.8
+   #12853
+  </li>
+  <li>
+   feat(ci): Add eslint rule prefer-template
+   #12889
+  </li>
+  <li>
+   Labeler: Add
+   qml
+   to labeler config
+   #12911
+  </li>
+  <li>
+   WTrackMenu: Add missing wcoverartlabel.h include
+   #12924
+  </li>
+  <li>
+   Fix clazy complains and naming
+   #12935
+  </li>
+  <li>
+   src/library: Sort files into sub-directories
+   #12956
+  </li>
+  <li>
+   CMakeLists: Fix deduplication trap with
+   --preload-file
+   #12944
+  </li>
+  <li>
+   Add CI runner that allows cleaning up the download server
+   #12957
+  </li>
   <li>
    Update to latest vcpkg dependencies
    #11649
    #12512
    #12067
+   #12898
   </li>
   <li>
    GitHub actions updates
@@ -562,7 +704,7 @@
  </ul>
 </description>
     </release>
-    <release version="2.4.1" type="development" date="2024-02-23" timestamp="1708721847">
+    <release version="2.4.1" type="development" date="2024-03-18" timestamp="1710747808">
       <description>
  <p>
   Controller Mappings