diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ac9f561..2c7228fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v 0.6.1 21 May 2014
+*Fixes*
+- Fixes an issue where the wrong transition was passed to after_transition callbacks for the second and subsequent transition of a given state machine (patch by [@alan](https://github.com/alan))
+
 ## v0.6.0, 19 May 2014
 *Additions*
 - Generators now handle namespaced classes (patch by [@hrmrebecca](https://github.com/hrmrebecca))
diff --git a/lib/statesman/version.rb b/lib/statesman/version.rb
index 82af4032..4d5339a7 100644
--- a/lib/statesman/version.rb
+++ b/lib/statesman/version.rb
@@ -1,3 +1,3 @@
 module Statesman
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end