diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index d16e7570a..c43b8ca0b 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -101,6 +101,8 @@ Changed
 - `tabs -> title-format` now treats an empty string as valid.
 - Bindings for `:`, `/` and `?` are now configured explicitly and not hardcoded
   anymore.
+- The `completion -> show` setting can now be set to `always`, `auto` or
+  `never`.
 
 Deprecated
 ~~~~~~~~~~
@@ -120,6 +122,8 @@ Removed
 - The `ui -> hide-mouse-cursor` setting since it was completely broken and
   nobody seemed to care.
 - The `hints -> opacity` setting - see the "Changed" section for details.
+- The `completion -> auto-open` setting got merged into `completion -> show` and
+  thus removed.
 
 Fixed
 ~~~~~
diff --git a/README.asciidoc b/README.asciidoc
index be82734f8..1e9313469 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -146,9 +146,9 @@ Contributors, sorted by the number of commits in descending order:
 * Antoni Boucher
 * Lamar Pavel
 * Jan Verbeek
+* Marshall Lochbaum
 * Bruno Oliveira
 * Alexander Cogneau
-* Marshall Lochbaum
 * Felix Van der Jeugt
 * Martin Tournoij
 * Raphael Pierzina
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index d121dd885..f3a6e29f5 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -74,10 +74,9 @@
 [options="header",width="75%",cols="25%,75%"]
 |==============
 |Setting|Description
-|<<completion-auto-open,auto-open>>|Automatically open completion when typing.
+|<<completion-show,show>>|When to show the autocompletion window.
 |<<completion-download-path-suggestion,download-path-suggestion>>|What to display in the download filename input.
 |<<completion-timestamp-format,timestamp-format>>|How to format timestamps (e.g. for history)
-|<<completion-show,show>>|Whether to show the autocompletion window.
 |<<completion-height,height>>|The height of the completion, in px or as percentage of the window.
 |<<completion-cmd-history-max-items,cmd-history-max-items>>|How many commands to save in the command history.
 |<<completion-web-history-max-items,web-history-max-items>>|How many URLs to show in the web history.
@@ -803,16 +802,17 @@ This setting is only available with the QtWebKit backend.
 == completion
 Options related to completion and command history.
 
-[[completion-auto-open]]
-=== auto-open
-Automatically open completion when typing.
+[[completion-show]]
+=== show
+When to show the autocompletion window.
 
 Valid values:
 
- * +true+
- * +false+
+ * +always+: Whenever a completion is available.
+ * +auto+: Whenever a completion is requested.
+ * +never+: Never.
 
-Default: +pass:[true]+
+Default: +pass:[always]+
 
 [[completion-download-path-suggestion]]
 === download-path-suggestion
@@ -832,17 +832,6 @@ How to format timestamps (e.g. for history)
 
 Default: +pass:[%Y-%m-%d]+
 
-[[completion-show]]
-=== show
-Whether to show the autocompletion window.
-
-Valid values:
-
- * +true+
- * +false+
-
-Default: +pass:[true]+
-
 [[completion-height]]
 === height
 The height of the completion, in px or as percentage of the window.