diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 7eecf3b82..cccc7bb22 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -23,6 +23,8 @@ Added
 
 - New `{current_url}` field for `window.title_format` and `tabs.title.format`.
 - New `colors.statusbar.passthrough.fg`/`.bg` settings.
+- New `completion.delay` and `completion.min_chars` settings to update the
+  completion less often.
 
 v1.0.2 (unreleased)
 -------------------
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index f9a5aaeb0..7678583b7 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -96,7 +96,9 @@
 |<<colors.tabs.selected.odd.fg,colors.tabs.selected.odd.fg>>|Foreground color of selected odd tabs.
 |<<colors.webpage.bg,colors.webpage.bg>>|Background color for webpages if unset (or empty to use the theme's color)
 |<<completion.cmd_history_max_items,completion.cmd_history_max_items>>|How many commands to save in the command history.
+|<<completion.delay,completion.delay>>|Delay in ms before updating completions after typing a character.
 |<<completion.height,completion.height>>|The height of the completion, in px or as percentage of the window.
+|<<completion.min_chars,completion.min_chars>>|Minimum amount of characters needed to update completions.
 |<<completion.quick,completion.quick>>|Move on to the next part when there's only one possible completion left.
 |<<completion.scrollbar.padding,completion.scrollbar.padding>>|Padding of scrollbar handle in the completion window (in px).
 |<<completion.scrollbar.width,completion.scrollbar.width>>|Width of the scrollbar in the completion window (in px).
@@ -1311,6 +1313,14 @@ Type: <<types,Int>>
 
 Default: +pass:[100]+
 
+[[completion.delay]]
+=== completion.delay
+Delay in ms before updating completions after typing a character.
+
+Type: <<types,Int>>
+
+Default: +pass:[0]+
+
 [[completion.height]]
 === completion.height
 The height of the completion, in px or as percentage of the window.
@@ -1319,6 +1329,14 @@ Type: <<types,PercOrInt>>
 
 Default: +pass:[50%]+
 
+[[completion.min_chars]]
+=== completion.min_chars
+Minimum amount of characters needed to update completions.
+
+Type: <<types,Int>>
+
+Default: +pass:[1]+
+
 [[completion.quick]]
 === completion.quick
 Move on to the next part when there's only one possible completion left.
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 700dd4ddd..44c405a2f 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -683,14 +683,14 @@ completion.delay:
   type:
     name: Int
     minval: 0
-  desc: Delay in ms before updating completions after typing a character
+  desc: Delay in ms before updating completions after typing a character.
 
 completion.min_chars:
   default: 1
   type:
     name: Int
     minval: 1
-  desc: Minimum amount of characters needed to update completions
+  desc: Minimum amount of characters needed to update completions.
 
 ## downloads