diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index f0fb2f11b..2057265a8 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -58,6 +58,7 @@ Changed
 - With `new-instance-open-target` set to a tab option, the tab is now opened in
   the most recently focused (instead of the last opened) window. This can be
   configured with the new `new-instance-open-target.window` setting.
+- Word hints now are more clever about getting the element text from some elements.
 
 Removed
 ~~~~~~~
diff --git a/README.asciidoc b/README.asciidoc
index 65bd44d6f..be816198d 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -175,9 +175,9 @@ Contributors, sorted by the number of commits in descending order:
 * Clayton Craft
 * nanjekyejoannah
 * Oliver Caldwell
+* Niklas Haas
 * Jonas Schürmann
 * error800
-* Niklas Haas
 * Liam BEGUIN
 * skinnay
 * Zach-Button
diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py
index 7ffa634eb..ce6cb42de 100644
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@@ -1053,6 +1053,7 @@ class WordHinter:
             "img": ["alt", "title", "src"],
             "a": ["title", "href", "text"],
             "input": ["name", "placeholder"],
+            "textarea": ["name", "placeholder"],
             "button": ["text"]
         })