diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 386a92e6e..7372bc092 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -108,6 +108,7 @@ Fixed
 - Using an external editor should now work correctly with some funny chars
   (U+2028/U+2029/BOM).
 - Movements in caret mode now should work correctly on OS X and Windows.
+- Fixed upgrade from earlier config versions.
 
 v0.4.1
 ------
diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 77270b765..46a95cf72 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -337,7 +337,6 @@ class ConfigManager(QObject):
         ('colors', 'tab.indicator.stop'): 'tabs.indicator.stop',
         ('colors', 'tab.indicator.error'): 'tabs.indicator.error',
         ('colors', 'tab.indicator.system'): 'tabs.indicator.system',
-        ('tabs', 'auto-hide'): 'hide-auto',
         ('completion', 'history-length'): 'cmd-history-max-items',
         ('colors', 'downloads.fg'): 'downloads.fg.start',
     }
@@ -347,6 +346,7 @@ class ConfigManager(QObject):
         ('colors', 'completion.item.bg'),
         ('tabs', 'indicator-space'),
         ('tabs', 'hide-auto'),
+        ('tabs', 'auto-hide'),
         ('tabs', 'hide-always'),
     ]
     CHANGED_OPTIONS = {