diff --git a/README.asciidoc b/README.asciidoc
index e98a00b3b..56e9df344 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -233,6 +233,7 @@ Contributors, sorted by the number of commits in descending order:
 // QUTE_AUTHORS_START
 * Florian Bruhin
 * Claude
+* Peter Vilim
 // QUTE_AUTHORS_END
 
 Thanks / Similiar projects
diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py
index d71613c59..df42f26b1 100644
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@@ -110,6 +110,7 @@ class HintManager(QObject):
         display: {display};
         color: {config[colors][hints.fg]};
         background: {config[colors][hints.bg]};
+        text-transform: {texttransform};
         font: {config[fonts][hints]};
         border: {config[hints][border]};
         opacity: {config[hints][opacity]};
@@ -271,6 +272,13 @@ class HintManager(QObject):
             display = 'inline'
         else:
             display = 'none'
+
+        # Make text uppercase if set in config
+        if (config.get('hints', 'uppercase') and
+                config.get('hints', 'mode') == 'letter'):
+            texttransform = 'uppercase'
+        else:
+            texttransform = 'none'
         rect = elem.geometry()
         left = rect.x()
         top = rect.y()
@@ -279,7 +287,8 @@ class HintManager(QObject):
             left /= zoom
             top /= zoom
         return self.HINT_CSS.format(
-            left=left, top=top, config=objreg.get('config'), display=display)
+            left=left, top=top, config=objreg.get('config'), display=display,
+            texttransform=texttransform)
 
     def _draw_label(self, elem, string):
         """Draw a hint label over an element.
diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index 257d4aaef..91ef0cee1 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -512,6 +512,10 @@ DATA = collections.OrderedDict([
          SettingValue(typ.String(minlen=2), 'asdfghjkl'),
          "Chars used for hint strings."),
 
+        ('uppercase',
+         SettingValue(typ.Bool(), 'false'),
+         "Make chars in hint strings uppercase."),
+
         ('auto-follow',
          SettingValue(typ.Bool(), 'true'),
          "Whether to auto-follow a hint if there's only one left."),