diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py
index f32389025..3c2b3e50e 100644
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@@ -152,7 +152,7 @@ class HintContext:
         to_follow: The link to follow when enter is pressed.
         args: Custom arguments for userscript/spawn
         rapid: Whether to do rapid hinting.
-        history: Whether to add yanked or spawned link to the history.
+        addhistory: Whether to add yanked or spawned link to the history.
         filterstr: Used to save the filter string for restoring in rapid mode.
         tab: The WebTab object we started hinting in.
         group: The group of web elements to hint.
@@ -165,7 +165,7 @@ class HintContext:
         self.baseurl = None
         self.to_follow = None
         self.rapid = False
-        self.history = False
+        self.addhistory = False
         self.filterstr = None
         self.args = []
         self.tab = None
@@ -603,16 +603,15 @@ class HintManager(QObject):
     @cmdutils.register(instance='hintmanager', scope='tab', name='hint',
                        star_args_optional=True, maxsplit=2)
     @cmdutils.argument('win_id', win_id=True)
-    @cmdutils.argument('history', flag="s")
     def start(self, rapid=False, group=webelem.Group.all, target=Target.normal,
-              *args, win_id, mode=None, history=False):
+              *args, win_id, mode=None, addhistory=False):
         """Start hinting.
 
         Args:
             rapid: Whether to do rapid hinting. This is only possible with
                    targets `tab` (with background-tabs=true), `tab-bg`,
                    `window`, `run`, `hover`, `userscript` and `spawn`.
-            history: Whether to add spawned or yanked link to the
+            addhistory: Whether to add spawned or yanked link to the
                        browsing history.
             group: The element types to hint.
 
@@ -696,7 +695,7 @@ class HintManager(QObject):
         self._context.target = target
         self._context.rapid = rapid
         self._context.hint_mode = mode
-        self._context.history = history
+        self._context.addhistory = addhistory
         try:
             self._context.baseurl = tabbed_browser.current_url()
         except qtutils.QtValueError:
@@ -866,7 +865,7 @@ class HintManager(QObject):
                 return
             handler = functools.partial(url_handlers[self._context.target],
                                         url, self._context)
-            if self._context.history:
+            if self._context.addhistory:
                 objreg.get('web-history').add_url(url, "")
         else:
             raise ValueError("No suitable handler found!")
diff --git a/tests/end2end/features/history.feature b/tests/end2end/features/history.feature
index 0ea1a5352..fa1fa8fe5 100644
--- a/tests/end2end/features/history.feature
+++ b/tests/end2end/features/history.feature
@@ -60,7 +60,7 @@ Feature: Page history
 
     Scenario: History with yanked URL and 'add to history' flag
         When I open data/hints/html/simple.html
-        And I hint with args "--history links yank" and follow a
+        And I hint with args "--addhistory links yank" and follow a
         Then the history file should contain:
             http://localhost:(port)/data/hints/html/simple.html Simple link
             http://localhost:(port)/data/hello.txt