diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6c5f1bd..4a5474c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # OctoPrint Changelog
 
-## 1.2.0 (In Development)
+## 1.2.0 - Unreleased
 
 ### New Features
 
@@ -14,19 +14,26 @@
   - Romanian (ro)
 * New file list: Pagination is gone, no more (mobile incompatible) pop overs, instead scrollable and with instant
   search
+* You can now define a folder (default: `~/.octoprint/watched`) to be watched for newly added GCODE (or -- if slicing
+  support is enabled -- STL) files to automatically add.
 
 ### Improvements
 
 * Logging is now configurable via config file
 * Added last print time to additional GCODE file information
+* Better error handling for capture issues during timelapse creation & more robust handling of missing images during
+  timelapse creation
+* Start counting the layers at 1 instead of 0 in the GCODE viewer
+* Upgraded [Font Awesome](https://fortawesome.github.io/Font-Awesome/) to version 3.2.1
+* Better error reporting for timelapse rendering and system commands
+* Supports
 
 ### Bug Fixes
 
 * [#435](https://github.com/foosel/OctoPrint/issues/435) - Always interpret negative duration (e.g. for print time left)
   as 0
 
-
-## 1.1.0
+## 1.1.0 - 2014-09-03
 
 ### New Features