diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index bc13b56e7..7286eb547 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,8 @@ Added
 - A new command `:paste-primary` got added to paste the primary selection, and
   `<Shift-Insert>` got added as a binding so it pastes primary rather than
   clipboard.
+- New mode `word` for `hints -> mode` which uses a dictionary and link-texts
+  for hints instead of single characters.
 
 Changed
 ~~~~~~~
diff --git a/README.asciidoc b/README.asciidoc
index cf9a6a1c7..927b39da4 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -149,6 +149,7 @@ Contributors, sorted by the number of commits in descending order:
 * Martin Tournoij
 * Raphael Pierzina
 * Joel Torstensson
+* Felix Van der Jeugt
 * Claude
 * meles5
 * Patric Schmitz
@@ -171,7 +172,6 @@ Contributors, sorted by the number of commits in descending order:
 * error800
 * Zach-Button
 * Halfwit
-* Felix Van der Jeugt
 * rikn00
 * Michael Ilsaas
 * Martin Zimmermann
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 0dc8a9e3b..4142adbe7 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -179,6 +179,7 @@
 |<<hints-min-chars,min-chars>>|Minimum number of chars used for hint strings.
 |<<hints-scatter,scatter>>|Whether to scatter hint key chains (like Vimium) or not (like dwb).
 |<<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>>|Whether to auto-follow a hint if there's only one left.
 |<<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.
@@ -1538,6 +1539,7 @@ Valid values:
 
  * +number+: Use numeric hints.
  * +letter+: Use the chars in the hints -> chars setting.
+ * +word+: Use hints words based on the html elements and the extra words.
 
 Default: +pass:[letter]+
 
@@ -1575,6 +1577,12 @@ Valid values:
 
 Default: +pass:[false]+
 
+[[hints-dictionary]]
+=== dictionary
+The dictionary file to be used by the word hints.
+
+Default: +pass:[/usr/share/dict/words]+
+
 [[hints-auto-follow]]
 === auto-follow
 Whether to auto-follow a hint if there's only one left.