diff --git a/CHANGELOG.md b/CHANGELOG.md
index e94bf47c..5ceb6ab4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+#### 1.6.1
+
+* [Improved] Attempts to fix broken config files automatically
+
 #### 1.6.0
 
 * [Improved] Passwords are now saved in the key-chain. The `password` field in `.jrnl_config` is soft-deprecated.
diff --git a/jrnl/__init__.py b/jrnl/__init__.py
index 4d384eb8..0e06627b 100644
--- a/jrnl/__init__.py
+++ b/jrnl/__init__.py
@@ -7,7 +7,7 @@ jrnl is a simple journal application for your command line.
 """
 
 __title__ = 'jrnl'
-__version__ = '1.6.0-dev'
+__version__ = '1.6.1-dev'
 __author__ = 'Manuel Ebert'
 __license__ = 'MIT License'
 __copyright__ = 'Copyright 2013 Manuel Ebert'