diff --git a/CHANGELOG.md b/CHANGELOG.md
index aaf2964..f0f2abb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## Version 6.0
+
+### FEAT
+
+- Improved RuboCop support with autocorrect commands, fix on save and offenses list
+
+### REFACTOR
+
+- Update extension structure to not use npm
+- Update extension icons
+
+### Fix
+
+- Resolved a parsing issue of Rails Notes with "/" in it
+- Removed an error-prone option from task templates
+
 ## Version 5.2
 
 ### FIX
diff --git a/extension.json b/extension.json
index eacbcdc..6b2c26b 100644
--- a/extension.json
+++ b/extension.json
@@ -3,7 +3,7 @@
   "name": "Ruby on Rails",
   "organization": "Tommaso Negri",
   "description": "Ruby on Rails and Ruby support for Nova editor.",
-  "version": "5.2",
+  "version": "6.0",
   "main": "main.js",
   "license": "MIT",
   "keywords": [