diff --git a/README.rst b/README.rst
index 72e5cad7..62663785 100644
--- a/README.rst
+++ b/README.rst
@@ -168,10 +168,11 @@ Username & Password
 -------------------
 
 Some extractors require you to provide valid login-credentials in the form of
-a username & password pair.
-This is necessary for ``pixiv``, ``nijie`` and ``seiga``
-and optional (but strongly recommended) for ``exhentai``,  ``luscious``,
-``sankaku``, ``idolcomplex``, ``tsumino`` and ``wallhaven``.
+a username & password pair. This is necessary for
+``pixiv``, ``nijie``, and ``seiga``
+and optional (but strongly recommended) for
+``danbooru``, ``exhentai``, ``idolcomplex``, ``instagram``,
+``luscious``, ``sankaku``, ``tsumino``, and ``twitter``.
 
 You can set the necessary information in your configuration file
 (cf. gallery-dl.conf_)
diff --git a/docs/configuration.rst b/docs/configuration.rst
index 8e32f1fe..819874c5 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -164,10 +164,11 @@ Default     ``null``
 Description The username and password to use when attempting to log in to
             another site.
 
-            Specifying username and password is
-            required for the ``pixiv``, ``nijie`` and ``seiga`` modules and
-            optional (but strongly recommended) for ``danbooru``, ``exhentai``,
-            ``sankaku`` and ``idolcomplex``.
+            Specifying username and password is required for the
+            ``pixiv``, ``nijie``, and ``seiga``
+            modules and optional (but strongly recommended) for
+            ``danbooru``, ``exhentai``, ``idolcomplex``, ``instagram``,
+            ``luscious``, ``sankaku``, ``tsumino``, and ``twitter``.
 
             These values can also be set via the ``-u/--username`` and
             ``-p/--password`` command-line options or by using a |.netrc|_ file.
diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst
index 6c3c04fd..676450f7 100644
--- a/docs/supportedsites.rst
+++ b/docs/supportedsites.rst
@@ -108,7 +108,7 @@ Tsumino              https://www.tsumino.com/            Galleries, Search Resul
 Tumblr               https://www.tumblr.com/             Images from Users, Likes, Posts, Tag-Searches      Optional (OAuth)
 Twitter              https://twitter.com/                Media Timelines, Timelines, Tweets                 Optional
 VSCO                 https://vsco.co/                    Images from Users, Collections, individual Images
-Wallhaven            https://wallhaven.cc/               individual Images, Search Results
+Wallhaven            https://wallhaven.cc/               individual Images, Search Results                  |wallhaven-A|
 Warosu               https://warosu.org/                 Threads
 Weibo                https://www.weibo.com/              Images from Users, Images from Statuses
 WikiArt.org          https://www.wikiart.org/            Artists, Artworks
@@ -139,4 +139,5 @@ Turboimagehost       https://www.turboimagehost.com/     individual Images
 .. |pixnet-C| replace:: Images from Users, Folders, individual Images, Sets
 .. |pornreactor-C| replace:: Images from Users, Posts, Search Results, Tag-Searches
 .. |smugmug-C| replace:: Albums, individual Images, Images from Users and Folders
+.. |wallhaven-A| replace:: Optional (`API Key <configuration.rst#extractorwallhavenapi-key>`__)
 .. |yuki-S| replace:: yuki.la 4chan archive
diff --git a/scripts/supportedsites.py b/scripts/supportedsites.py
index 8e4e2435..409b3857 100755
--- a/scripts/supportedsites.py
+++ b/scripts/supportedsites.py
@@ -123,6 +123,8 @@ AUTH_MAP = {
     "tsumino"    : "Optional",
     "tumblr"     : "Optional (OAuth)",
     "twitter"    : "Optional",
+    "wallhaven"  : ("Optional (`API Key "
+                    "<configuration.rst#extractorwallhavenapi-key>`__)"),
 }
 
 IGNORE_LIST = (