diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22c63f4..2ee0b2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.8.2 - September 30, 2011
+
+### Bugs fixes:
+
+- Fixed guard stop to prevent run_guard_task(:stop) to be skipped [guard-spork issue #28](https://github.com/guard/guard-spork/issues/28). ([@thibaudgg][])
+
+### Improvement:
+
+- Update docs regarding :task_has_failed. ([@netzpirat][])
+
 ## 0.8.1 - September 29, 2011
 
 ### Bugs fixes:
diff --git a/lib/guard/version.rb b/lib/guard/version.rb
index 8283c93..4c5b4ca 100644
--- a/lib/guard/version.rb
+++ b/lib/guard/version.rb
@@ -1,6 +1,6 @@
 module Guard
   unless defined? Guard::VERSION
     # The current gem version of Guard
-    VERSION = '0.8.1'
+    VERSION = '0.8.2'
   end
 end