diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2f12015a8..458e4b8d2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -162,7 +162,7 @@ New features:
 * Use the musicbrainz genre tag api to get genre information.  This currently
   depends on functionality that is currently unreleased in musicbrainzngs.
   Once the functionality has been released, you can enable it with the
-  ``use_mb_genres`` option.  See
+  ``genres`` option inside the ``musicbrainz`` config.  See
   https://github.com/alastair/python-musicbrainzngs/pull/247 and
   https://github.com/alastair/python-musicbrainzngs/pull/266 .
   Thanks to :user:`aereaux`.
diff --git a/docs/reference/config.rst b/docs/reference/config.rst
index 57c03cf8e..6aa9f5f53 100644
--- a/docs/reference/config.rst
+++ b/docs/reference/config.rst
@@ -356,15 +356,6 @@ Sets the albumartist for various-artist compilations. Defaults to ``'Various
 Artists'`` (the MusicBrainz standard). Affects other sources, such as
 :doc:`/plugins/discogs`, too.
 
-.. _use_mb_genres:
-
-use_mb_genres
-~~~~~~~~~~~~~
-
-Use MusicBrainz genre tags to populate the ``genre`` tag.  This will make it a
-semicolon-separated list of all the genres tagged for the release on
-MusicBrainz.
-
 UI Options
 ----------
 
@@ -729,6 +720,17 @@ above example.
 
 Default: ``[]``
 
+.. _genres:
+
+genres
+~~~~~~
+
+Use MusicBrainz genre tags to populate the ``genre`` tag.  This will make it a
+semicolon-separated list of all the genres tagged for the release on
+MusicBrainz.
+
+Default: ``no``
+
 .. _match-config:
 
 Autotagger Matching Options