diff --git a/CHANGELOG.md b/CHANGELOG.md
index 457946ff..7ad22dac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 ### Bug Fixes
 
 * [#580](https://github.com/foosel/OctoPrint/issues/580) - Properly unset job data when instructed so by callers
+* [#604](https://github.com/foosel/OctoPrint/issues/604) - Properly initialize settings basedir on server startup
 * [IRC] Also allow downloading .g files via Tornado
 
 ## 1.1.0 (2014-09-03)