diff --git a/bosh-setup/CHANGELOG.md b/bosh-setup/CHANGELOG.md
index 330b1154544e..eb3b0ab2d30a 100644
--- a/bosh-setup/CHANGELOG.md
+++ b/bosh-setup/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v2.1.1 (2016-10-20)
+
+- Upgrade CustomScript to 2.0
+- Add a retry logic for uploading stemcell and release
+- Bug fixes
+  - Install prerequisites at the beginning to avoid a silent error when install msrest
+
 # v2.1.0 (2016-10-11)
 
 - Upgrade versions
diff --git a/bosh-setup/metadata.json b/bosh-setup/metadata.json
index 96d4483c3fc8..1e8751f998bb 100644
--- a/bosh-setup/metadata.json
+++ b/bosh-setup/metadata.json
@@ -3,5 +3,5 @@
   "description": "This template helps you setup a development environment where you can deploy BOSH and Cloud Foundry.",
   "summary": "This template helps you setup a development environment where you can deploy BOSH and Cloud Foundry.",
   "githubUsername": "bingosummer",
-  "dateUpdated": "2016-10-11"
+  "dateUpdated": "2016-10-20"
 }