diff --git a/CHANGELOG.md b/CHANGELOG.md
index 995833626..4e3c458bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# 1.17.0 (05.07.2017)
+- Cleanup F# build template output on macOS - #3897
+- Add disable flag for OpenWhisk functions - #3830
+- Only redeploy when the code/config changes - #3838
+- Add opt-out config for dev dependency exclusion - #3877
+- Add infinite stack trace for errors - #3839
+- Fixed a bug with autocomplete - #3798
+
+
+## Meta
+- [Comparison since last release](https://github.com/serverless/serverless/compare/v1.16.1...v1.17.0)
+
+
 # 1.16.1 (26.06.2017)
 - CI/CD fix for the Serverless Platform - #3829
 
diff --git a/package-lock.json b/package-lock.json
index 25dd6da19..c881f0a7f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "1.17.0-alpha.1",
+  "version": "1.17.0",
   "lockfileVersion": 1,
   "dependencies": {
     "@types/async": {
diff --git a/package.json b/package.json
index 5e5c704ad..4dcbd8e00 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "1.17.0-alpha.1",
+  "version": "1.17.0",
   "engines": {
     "node": ">=4.0"
   },