diff --git a/CHANGELOG.md b/CHANGELOG.md
index d150f82c..7f73237a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### 2.6.0 (2017-08-18)
+
+- Mass export to JPG/PNG ([#166](https://github.com/mjmlio/mjml-app/issues/166))
+- Improved beautify ([#140](https://github.com/mjmlio/mjml-app/issues/140))
+- Put in trash instead of permanently delete folders & files ([#168](https://github.com/mjmlio/mjml-app/issues/168))
+
 ### 2.5.0 (2017-07-28)
 
 - Paste multiple target emails in the send modal ([#164](https://github.com/mjmlio/mjml-app/issues/164))
diff --git a/app/package.json b/app/package.json
index dc502af6..e3cc12cc 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mjml-app",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "productName": "MJML",
   "description": "The desktop app for MJML",
   "main": "./main.js",
diff --git a/package.json b/package.json
index 27053368..39f4a7b1 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "name": "mjml-app",
   "productName": "MJML",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "The desktop app for MJML",
   "main": "app/main.js",
   "scripts": {