diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf1251e1b..8c0535661 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.3.6 (June 17th, 2011)
+* fix bug in Time/DateTime range detection
+* (win32) fix bug where the Mysql2::Client object wasn't cleaned up properly if interrupted during a query
+* add Mysql2::Result#count (aliased as size) to get the row count for the dataset
+  this can be especially helpful if you want to get the number of rows without having to inflate
+  the entire dataset into ruby (since this happens lazily)
+
 ## 0.3.5 (June 15th, 2011)
 * bug fix for Time/DateTime usage depending on 32/64bit Ruby
 
@@ -26,6 +33,16 @@
 * BREAKING CHANGE: the ActiveRecord adapter has been pulled into Rails 3.1 and is no longer part of the gem
 * added Mysql2::Client.escape (class-level) for raw one-off non-encoding-aware escaping
 
+## 0.2.11 (June 17th, 2011)
+* fix bug in Time/DateTime range detection
+* (win32) fix bug where the Mysql2::Client object wasn't cleaned up properly if interrupted during a query
+* add Mysql2::Result#count (aliased as size) to get the row count for the dataset
+  this can be especially helpful if you want to get the number of rows without having to inflate
+  the entire dataset into ruby (since this happens lazily)
+
+## 0.2.10 (June 15th, 2011)
+* bug fix for Time/DateTime usage depending on 32/64bit Ruby
+
 ## 0.2.9 (June 15th, 2011)
 * fix a long standing bug where a signal would interrupt rb_thread_select and put the connection in a permanently broken state
 * turn on casting in the ActiveRecord again, users can disable it if they need to for performance reasons
diff --git a/lib/mysql2/version.rb b/lib/mysql2/version.rb
index dfe023d1f..722fee69a 100644
--- a/lib/mysql2/version.rb
+++ b/lib/mysql2/version.rb
@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end