diff --git a/CHANGELOG.md b/CHANGELOG.md
index e58d9bb9..0eaa5249 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,39 @@
 
 -----------------
 
+## 0.9.21 (2016 Jul 12)
+
+### Release Notes
+
+* Previous version (0.9.20) returned with exit code 0, even if command failed. This version fixes this issue and includes integration tests to catch this in automated tests in the future.
+
+### Install or upgrade
+
+To install this version, run the following commands (in a bash shell):
+
+```
+curl -fL https://github.com/bitrise-io/stepman/releases/download/0.9.21/stepman-$(uname -s)-$(uname -m) > /usr/local/bin/stepman
+```
+
+Then:
+
+```
+chmod +x /usr/local/bin/stepman
+```
+
+That's all, you're ready to call `stepman`!
+
+### Release Commits - 0.9.20 -> 0.9.21
+
+* [86b6172] Krisztián Gödrei - prepare for 0.9.21 (2016 Jul 12)
+* [4a24916] Krisztián Gödrei - Merge pull request #199 from godrei/exit_status_fix (2016 Jul 12)
+* [d8cca3a] Krisztián Gödrei - exist status test (2016 Jul 12)
+* [40c8517] Krisztián Gödrei - exist status fix (2016 Jul 12)
+* [92830ff] Krisztián Gödrei - Merge branch 'master' of github.com:bitrise-io/stepman (2016 Jul 12)
+* [d34225e] Krisztián Gödrei - changelog update (2016 Jul 12)
+* [a6b4a3f] Krisztián Gödrei - Merge pull request #198 from godrei/master (2016 Jul 12)
+
+
 ## 0.9.20 (2016 Jul 12)
 
 ### Release Notes
diff --git a/bitrise.yml b/bitrise.yml
index a7dbdc90..2c0569d3 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -200,7 +200,7 @@ workflows:
         2, Export RELEASE_VERSION
         3, Create binaries
     envs:
-    - RELEASE_VERSION: 0.9.20
+    - RELEASE_VERSION: 0.9.21
     after_run:
     - _export_release_version
     - create_binaries
diff --git a/version/version.go b/version/version.go
index e7ac6ca8..44b79a1c 100644
--- a/version/version.go
+++ b/version/version.go
@@ -1,4 +1,4 @@
 package version
 
 // VERSION ...
-const VERSION = "0.9.20"
+const VERSION = "0.9.21"