diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22af8853..f54d552d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ TagLib 2.2 (Feb 18, 2026)
 
  * Support for Matroska (MKA, MKV) and WebM files.
  * Support for NI STEM in MP4 files.
+ * New method isDsd() in WavPack Properties.
  * Stricter verification of ID3v2 frames.
  * Fix setting the last header flag in Ogg FLAC files.
  * Fix reading of the last page in Ogg streams.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7dc6fdea..67f4be9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ include(CMakePackageConfigHelpers)
 
 option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
 if(APPLE)
-  option(BUILD_FRAMEWORK "Build an OS X framework" OFF)
+  option(BUILD_FRAMEWORK "Build a macOS framework" OFF)
   if(BUILD_FRAMEWORK)
     set(BUILD_SHARED_LIBS ON)
     #set(CMAKE_MACOSX_RPATH 1)
diff --git a/INSTALL.md b/INSTALL.md
index af9a7652..efa0daa2 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -63,13 +63,13 @@ and ID3 tags cannot be disabled. The following CMake options are available:
 | `WITH_APE`              | Build with APE, MPC, WavPack (default ON)          |
 | `WITH_ASF`              | Build with ASF (default ON)                        |
 | `WITH_DSF`              | Build with DSF (default ON)                        |
-| `WITH_MATROSKA`         | Build with Matroska (default ON)                   |
+| `WITH_MATROSKA`         | Build with Matroska, WebM (default ON)             |
 | `WITH_MOD`              | Build with Tracker modules (default ON)            |
 | `WITH_MP4`              | Build with MP4 (default ON)                        |
 | `WITH_RIFF`             | Build with AIFF, RIFF, WAV (default ON)            |
 | `WITH_SHORTEN`          | Build with Shorten (default ON)                    |
 | `WITH_TRUEAUDIO`        | Build with TrueAudio (default ON)                  |
-| `WITH_VORBIS`           | Build with Vorbis, FLAC, Ogg, Opus (default ON)    |
+| `WITH_VORBIS`           | Build with FLAC, Ogg, Opus, Speex (default ON)     |
 
 Note that disabling formats will remove exported symbols from the library and
 thus break binary compatibility. These options should therefore only be used
diff --git a/README.md b/README.md
index 083c9fdf..d3cb059e 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,11 @@
 https://taglib.org/
 
 TagLib is a library for reading and editing the metadata of several
-popular audio formats. Currently, it supports both ID3v1 and ID3v2
-for MP3 files, [Ogg Vorbis][] comments and ID3 tags
-in [FLAC][], MPC, Speex, WavPack, TrueAudio, WAV, AIFF, MP4, APE, ASF,
-DSF, DFF and AAC files.
+popular audio formats. Currently, it supports various metadata containers such
+as [ID3v1][], [ID3v2][] and [Vorbis][] comments for MP3, MP4, AAC,
+[Ogg][], [Opus][], [FLAC][], [Speex][], [APE][], [MPC][], [WavPack][],
+[WAV][], [AIFF][], [TrueAudio][], [Matroska][], [WebM][], ASF, WMA, DSF, DFF and
+tracker (MOD, XM, S3M, IT) files.
 
 TagLib is distributed under the [GNU Lesser General Public License][]
 (LGPL) and [Mozilla Public License][] (MPL). Essentially that means that
@@ -18,7 +19,20 @@ it may be used in proprietary applications, but if changes are made to
 TagLib they must be contributed back to the project. Please review the
 licenses if you are considering using TagLib in your project.
 
-  [Ogg Vorbis]: https://xiph.org/vorbis/
+  [ID3v1]: https://id3.org/ID3v1
+  [ID3v2]: https://id3.org/Home
+  [Vorbis]: https://xiph.org/vorbis/
+  [Ogg]: https://www.xiph.org/ogg/
+  [Opus]: https://opus-codec.org/
   [FLAC]: https://xiph.org/flac/
+  [Speex]: https://www.speex.org/
+  [APE]: https://www.monkeysaudio.com/
+  [MPC]: https://musepack.net/
+  [WavPack]: https://www.wavpack.com/
+  [WAV]: https://www.mmsp.ece.mcgill.ca/Documents/AudioFormats/WAVE/WAVE.html
+  [AIFF]: https://www.mmsp.ece.mcgill.ca/Documents/AudioFormats/AIFF/AIFF.html
+  [TrueAudio]: https://sourceforge.net/projects/tta/
+  [Matroska]: https://www.matroska.org/
+  [WebM]: https://www.webmproject.org/
   [GNU Lesser General Public License]: https://www.gnu.org/licenses/lgpl.html
   [Mozilla Public License]: https://www.mozilla.org/MPL/MPL-1.1.html
diff --git a/taglib/matroska/matroskafile.h b/taglib/matroska/matroskafile.h
index 559be5aa..cf183d4e 100644
--- a/taglib/matroska/matroskafile.h
+++ b/taglib/matroska/matroskafile.h
@@ -25,11 +25,14 @@
 #include "tfile.h"
 #include "matroskaproperties.h"
 
+//! An implementation of Matroska metadata
 namespace TagLib::Matroska {
   class Tag;
   class Attachments;
   class Chapters;
 
+  //! An implementation of TagLib::File with Matroska specific methods
+
   /*!
    * Implementation of TagLib::File for Matroska.
    */
diff --git a/taglib/toolkit/taglib.h b/taglib/toolkit/taglib.h
index a11ffac6..7e871876 100644
--- a/taglib/toolkit/taglib.h
+++ b/taglib/toolkit/taglib.h
@@ -77,7 +77,8 @@ namespace TagLib {
  * - A clean, high level, C++ API for handling audio metadata.
  * - Format specific APIs for advanced API users.
  * - ID3v1, ID3v2, APE, FLAC, Xiph, iTunes-style MP4 and WMA tag formats.
- * - MP3, MPC, FLAC, MP4, ASF, AIFF, WAV, DSF, DFF, TrueAudio, WavPack, Ogg FLAC, Ogg Vorbis, Speex and Opus file formats.
+ * - MP3, MPC, FLAC, MP4, ASF, AIFF, WAV, DSF, DFF, TrueAudio, WavPack, Ogg FLAC, Ogg Vorbis, Speex,
+ *   Opus, Matroska and WebM file formats.
  * - Basic audio file properties such as length, sample rate, etc.
  * - Long term binary and source compatibility.
  * - Extensible design, notably the ability to add other formats or extend current formats as a library user.