diff --git a/README.asciidoc b/README.asciidoc
index f0899b6c1..1012eeed2 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -225,6 +225,7 @@ Contributors, sorted by the number of commits in descending order:
 * haxwithaxe
 * evan
 * dylan araps
+* addictedtoflames
 * Xitian9
 * Tomas Orsava
 * Tom Janson
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index c0b4ad878..628a029e1 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -87,8 +87,8 @@
 [options="header",width="75%",cols="25%,75%"]
 |==============
 |Setting|Description
-|<<input-timeout,timeout>>|Timeout for ambiguous key bindings.
-|<<input-partial-timeout,partial-timeout>>|Timeout for partially typed key bindings.
+|<<input-timeout,timeout>>|Timeout (in milliseconds) for ambiguous key bindings.
+|<<input-partial-timeout,partial-timeout>>|Timeout (in milliseconds) for partially typed key bindings.
 |<<input-insert-mode-on-plugins,insert-mode-on-plugins>>|Whether to switch to insert mode when clicking flash and other plugins.
 |<<input-auto-leave-insert-mode,auto-leave-insert-mode>>|Whether to leave insert mode if a non-editable element is clicked.
 |<<input-auto-insert-mode,auto-insert-mode>>|Whether to automatically enter insert mode if an editable element is focused after page load.
@@ -182,7 +182,7 @@
 |<<hints-uppercase,uppercase>>|Make chars in hint strings uppercase.
 |<<hints-dictionary,dictionary>>|The dictionary file to be used by the word hints.
 |<<hints-auto-follow,auto-follow>>|Follow a hint immediately when the hint text is completely matched.
-|<<hints-auto-follow-timeout,auto-follow-timeout>>|A timeout to inhibit normal-mode key bindings after a successfulauto-follow.
+|<<hints-auto-follow-timeout,auto-follow-timeout>>|A timeout (in milliseconds) to inhibit normal-mode key bindings after a successful auto-follow.
 |<<hints-next-regexes,next-regexes>>|A comma-separated list of regexes to use for 'next' links.
 |<<hints-prev-regexes,prev-regexes>>|A comma-separated list of regexes to use for 'prev' links.
 |<<hints-find-implementation,find-implementation>>|Which implementation to use to find elements to hint.
@@ -900,7 +900,7 @@ Options related to input modes.
 
 [[input-timeout]]
 === timeout
-Timeout for ambiguous key bindings.
+Timeout (in milliseconds) for ambiguous key bindings.
 
 If the current input forms both a complete match and a partial match, the complete match will be executed after this time.
 
@@ -908,7 +908,7 @@ Default: +pass:[500]+
 
 [[input-partial-timeout]]
 === partial-timeout
-Timeout for partially typed key bindings.
+Timeout (in milliseconds) for partially typed key bindings.
 
 If the current input forms only partial matches, the keystring will be cleared after this time.
 
@@ -1667,7 +1667,7 @@ Default: +pass:[true]+
 
 [[hints-auto-follow-timeout]]
 === auto-follow-timeout
-A timeout to inhibit normal-mode key bindings after a successfulauto-follow.
+A timeout (in milliseconds) to inhibit normal-mode key bindings after a successful auto-follow.
 
 Default: +pass:[0]+
 
diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index df673a50b..fd0d5925a 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -488,13 +488,13 @@ def data(readonly=False):
         ('input', sect.KeyValue(
             ('timeout',
              SettingValue(typ.Int(minval=0, maxval=MAXVALS['int']), '500'),
-             "Timeout for ambiguous key bindings.\n\n"
+             "Timeout (in milliseconds) for ambiguous key bindings.\n\n"
              "If the current input forms both a complete match and a partial "
              "match, the complete match will be executed after this time."),
 
             ('partial-timeout',
              SettingValue(typ.Int(minval=0, maxval=MAXVALS['int']), '5000'),
-             "Timeout for partially typed key bindings.\n\n"
+             "Timeout (in milliseconds) for partially typed key bindings.\n\n"
              "If the current input forms only partial matches, the keystring "
              "will be cleared after this time."),
 
@@ -933,8 +933,8 @@ def data(readonly=False):
 
             ('auto-follow-timeout',
              SettingValue(typ.Int(), '0'),
-             "A timeout to inhibit normal-mode key bindings after a successful"
-             "auto-follow."),
+             "A timeout (in milliseconds) to inhibit normal-mode key bindings "
+             "after a successful auto-follow."),
 
             ('next-regexes',
              SettingValue(typ.List(typ.Regex(flags=re.IGNORECASE)),