diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9eb65941..5e1a6593 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,8 +1,58 @@
+2011.08.02, Version 0.2.0
+
+* Split view (Julian Viereck)
+ - split editor area horizontally or vertivally to show two files at the same
+ time
+
+* Code Folding (Julian Viereck)
+ - Unstructured code folding
+ - Will be the basis for language aware folding
+
+* Mode bahaviours (Chris Spencer)
+ - Adds mode specific hooks which allow transformations of entered text
+ - Autoclosing of braces, paranthesis and quotation marks in C style modes
+ - Autoclosing of angular brackets in XML style modes
+
+* New language modes
+ - Clojure (Carin Meier)
+ - C# (Rob Conery)
+ - Groovy (Ben Tilford)
+ - Scala (Ben Tilford)
+ - JSON
+ - OCaml (Sergi Mansilla)
+ - Perl (Panagiotis Astithas)
+ - SCSS/SASS (Andreas Madsen)
+ - SVG
+ - Textile (Kelley van Evert)
+ - SCAD (Jacob Hansson)
+
+* Live syntax checks
+ - Lint for Css using CSS Lint
+ - CoffeeScript
+
+* New Themes
+ - Crimson Editor (iebuggy)
+ - Merbivore (Michael Schwartz)
+ - Merbivore soft (Michael Schwartz)
+ - Solarized dark/light (David Alan
+ Hjelle)
+ - Vibrant Ink (Michael Schwartz)
+
+* Bug fixes
+ - Add support for the new OSX scroll bars
+ - properly highlight JavaScript regexp literals
+ - proper handling of unicode characters in JavaScript identifiers
+ - proper highlighting of Ruby namespaces (Chris Wanstrath)
+ - fix remove lines command on last line (Harutyun Amirjanyan)
+ - Clicks which cause the editor to be focused don't reset the selection
+ - fix scroll wheel sluggishness in Safari
+
2011.02.14, Version 0.1.6
* Floating Anchors
- An Anchor is a floating pointer in the document.
- - Whenever text is inserted or deleted before the cursor, the position of the cursor is updated
+ - Whenever text is inserted or deleted before the cursor, the position of
+ the cursor is updated
- Usesd for the cursor and selection
- Basis for bookmarks, multiple cursors and snippets in the future
* Extensive support for Cocoa style keybindings on the Mac
@@ -16,7 +66,8 @@
- Markers can be in front or behind the text
- Markers are now stored in the session (was in the renderer)
* Lots of IE8 fixes including copy, cut and selections
-* Unit tests can also be run in the browser
+* Unit tests can also be run in the browser
+
* Soft wrap can adapt to the width of the editor (Mike Ratcliffe, Joe Cheng)
* Add minimal node server server.js to run the Ace demo in Chrome
* The top level editor.html demo has been renamed to index.html