diff --git a/docs/changelog.rst b/docs/changelog.rst
index 82172f545..5b35ba9a3 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,11 +1,6 @@
 Changelog
 =========
 
-* :doc:`/plugins/embyupdate`: Use the option of Emby's API Key's rather than
-  a password. Add an apikey to your config file for this to work. Does not
-  break the use of password as an authentication method
-
-
 1.4.0 (in development)
 ----------------------
 
@@ -23,11 +18,13 @@ to know:
 * Please don't package beets as a Python 3 application *yet*, even though some
   things may appear to work under Python 3.4 and later.
 
-There's a small new feature:
+The are a couple of small new features:
 
 * :doc:`/plugins/web`: Added an ``expand`` option to show the items of an
   album and a ``path`` field to the JSON output of a file which shows the
   filled-out path template for each file. :bug:`2050`
+* :doc:`/plugins/embyupdate`: The plugin can now use an API key instead of a
+  password to authenticate with Emby. :bug:`2045` :bug:`2117`
 
 And there are a few bug fixes too:
 
diff --git a/docs/plugins/embyupdate.rst b/docs/plugins/embyupdate.rst
index f2826040c..a902e6076 100644
--- a/docs/plugins/embyupdate.rst
+++ b/docs/plugins/embyupdate.rst
@@ -10,7 +10,6 @@ To use ``embyupdate`` plugin, enable it in your configuration (see :ref:`using-p
         port: 8096
         username: user
         apikey: apikey
-        password: password
 
 To use the ``embyupdate`` plugin you need to install the `requests`_ library with::
 
@@ -31,5 +30,9 @@ The available options under the ``emby:`` section are:
 - **port**: The Emby server port.
   Default: 8096
 - **username**: A username of a Emby user that is allowed to refresh the library.
-- **apikey**: An Emby API key
-- **password**: If no API key is present then enter the user aboves password.
+- **apikey**: An Emby API key for the user.
+- **password**: The password for the user. (This is only necessary if no API
+  key is provided.)
+
+You can choose to authenticate either with `apikey` or `password`, but only
+one of those two is required.