diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 353f5b25a..c1f4e2d2f 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -34,6 +34,8 @@ Added
   them. There's also a new `show-switching` option to configure the timeout.
 - New setting `storage -> remember-download-directory` to remember the last
   used download directory.
+- New setting `storage -> prompt-download-directory` to download all downloads
+  without asking.
 
 Changed
 ~~~~~~~
diff --git a/README.asciidoc b/README.asciidoc
index 7d5431fdd..c2ecbf107 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -153,6 +153,7 @@ Contributors, sorted by the number of commits in descending order:
 * Martin Zimmermann
 * Error 800
 * Brian Jackson
+* Alexander Cogneau
 * sbinix
 * Tobias Patzl
 * Johannes Altmanninger
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 3cb7f400f..114f06b30 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -123,6 +123,7 @@
 |==============
 |Setting|Description
 |<<storage-download-directory,download-directory>>|The directory to save downloads to. An empty value selects a sensible os-specific default. Will expand environment variables.
+|<<storage-prompt-download-directory,prompt-download-directory>>|Whether to prompt the user for the download location.
 |<<storage-remember-download-directory,remember-download-directory>>|Whether to remember the last used download directory.
 |<<storage-maximum-pages-in-cache,maximum-pages-in-cache>>|The maximum number of pages to hold in the global memory page cache.
 |<<storage-object-cache-capacities,object-cache-capacities>>|The capacities for the global memory cache for dead objects such as stylesheets or scripts. Syntax: cacheMinDeadCapacity, cacheMaxDead, totalCapacity.
@@ -1106,6 +1107,18 @@ The directory to save downloads to. An empty value selects a sensible os-specifi
 
 Default: empty
 
+[[storage-prompt-download-directory]]
+=== prompt-download-directory
+Whether to prompt the user for the download location.
+If set to false, 'download-directory' will be used.
+
+Valid values:
+
+ * +true+
+ * +false+
+
+Default: +pass:[true]+
+
 [[storage-remember-download-directory]]
 === remember-download-directory
 Whether to remember the last used download directory.