diff --git a/CHANGES.md b/CHANGES.md
index 7ea98ff..ef53201 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,22 @@
+0.6.0
+----
+* Fix stack level too deep when writing to ChunkStream
+* Use HTTP::Resonse::Status::REASONS table ( HTTP::Response::* deprecated in the HTTP gem )
+* Use Timers 3.0.0 API
+* Case-insensitivity for header field names ( i.e. in case a proxy downcases them )
+* Catch when openssl sometimes fires ECONNRESET, EPIPE, ETIMEDOUT, EHOSTUNREACH and  as an error
+* Unused `optimize` socket modifications taken off all server implementations
+* Fixed 404 error in roundtrip example
+* Fixed "Reel::StateError: already processing a request" when client is killed
+* Numerous updates to rspec.
+* Switched to websocket/driver and improved websocket handling
+* Implement DriverEnvironment to fix websocket example
+* Refactored Server::HTTPS to be more idomatic
+* Fixed jRuby related test failures
+* Fixed "ArgumentError: Data object has already been freed" caused by underlying parser.
+
 0.5.0 (2014-04-15)
-------------------
+----
 * Reel::Server(::SSL) renamed to Reel::Server::HTTP and Reel::Server::HTTPS
 * New Reel::Spy API for observing requests and responses from the server
 * Fixes to chunked encoding handling