diff --git a/beetsplug/musicbrainz.py b/beetsplug/musicbrainz.py
index aac20e9ac..cceb1f05f 100644
--- a/beetsplug/musicbrainz.py
+++ b/beetsplug/musicbrainz.py
@@ -56,6 +56,8 @@ FIELDS_TO_MB_KEYS = {
     "label": "label",
     "media": "format",
     "year": "date",
+    "tracks": "tracks",
+    "alias": "alias",
 }
 
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index bd2243d67..36166b07a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,6 +12,8 @@ New features:
 Bug fixes:
 
 - :doc:`plugins/musicbrainz`: Fix search terms escaping. :bug:`6347`
+- :doc:`plugins/musicbrainz`: Fix support for ``alias`` and ``tracks``
+  :conf:`plugins.musicbrainz:extra_tags`.
 
 For packagers:
 
diff --git a/docs/plugins/musicbrainz.rst b/docs/plugins/musicbrainz.rst
index 60c3bc4a2..2baa36776 100644
--- a/docs/plugins/musicbrainz.rst
+++ b/docs/plugins/musicbrainz.rst
@@ -93,15 +93,23 @@ Default
     This setting should improve the autotagger results if the metadata with the
     given tags match the metadata returned by MusicBrainz.
 
-    Note that the only tags supported by this setting are: ``barcode``,
-    ``catalognum``, ``country``, ``label``, ``media``, and ``year``.
+    Tags supported by this setting:
+
+    * ``alias`` (also search for release aliases matching the query)
+    * ``barcode``
+    * ``catalognum``
+    * ``country``
+    * ``label``
+    * ``media``
+    * ``tracks`` (number of tracks on the release)
+    * ``year``
 
     Example:
 
     .. code-block:: yaml
 
         musicbrainz:
-            extra_tags: [barcode, catalognum, country, label, media, year]
+            extra_tags: [alias, barcode, catalognum, country, label, media, tracks, year]
 
 .. conf:: genres
     :default: no