diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 92129b3e1..6bd22ced2 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -81,6 +81,7 @@ Fixed
 - Fixed handling of keybindings containing Ctrl/Meta on OS X.
 - Fixed crash when downloading an URL without filename (e.g. magnet links) via "Save as...".
 - Fixed exception when starting qutebrowser with `:set` as argument.
+- Fixed exit status codes (successful exit was 1 instead of 0).
 
 https://github.com/The-Compiler/qutebrowser/releases/tag/v0.2.1[v0.2.1]
 -----------------------------------------------------------------------
diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py
index 5d19ad515..c82a54596 100644
--- a/qutebrowser/utils/usertypes.py
+++ b/qutebrowser/utils/usertypes.py
@@ -242,7 +242,7 @@ Completion = enum('Completion', ['command', 'section', 'option', 'value',
 
 # Exit statuses for errors. Needs to be an int for sys.exit.
 Exit = enum('Exit', ['ok', 'reserved', 'exception', 'err_ipc', 'err_init',
-                     'err_config', 'err_key_config'], is_int=True)
+                     'err_config', 'err_key_config'], is_int=True, start=0)
 
 
 class Question(QObject):
diff --git a/tests/utils/usertypes/test_enum.py b/tests/utils/usertypes/test_enum.py
index e1443b7be..7298b2861 100644
--- a/tests/utils/usertypes/test_enum.py
+++ b/tests/utils/usertypes/test_enum.py
@@ -54,3 +54,9 @@ def test_start():
     e = usertypes.enum('Enum', ['three', 'four'], start=3)
     assert e.three.value == 3
     assert e.four.value == 4
+
+
+def test_exit():
+    """Make sure the exit status enum is correct."""
+    assert usertypes.Exit.ok == 0
+    assert usertypes.Exit.reserved == 1