diff --git a/CHANGELOG.md b/CHANGELOG.md
index 628c9ed..b44b536 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,21 +1,41 @@
 # Netsix
 
-## v1.0.0-alpha.5 maxwell-mole (2017-03-23)
+## v1.0.0-alpha.6 newton-quintal (2017-03-27)
+
+
+## Bug Fixes
+  - change the path of the tray icon in production
+  ([be7cf44b](https://mmorainville@bitbucket.org/mathieumorainville/netsix-vue/commits/be7cf44b663337b0fe4d44570f86b4b5baebea52))
+
+
 
 
 ## Features
-  - add a donate link
-  ([856647c9](https://mmorainville@bitbucket.org/mathieumorainville/netsix-vue/commits/856647c90896bbb233ae45e18b998c9b04226960))
-  - catch errors when appending chunks to the SourceBuffer
-  ([b12b1074](https://mmorainville@bitbucket.org/mathieumorainville/netsix-vue/commits/b12b1074233262e007b27dbe7809d92ed3b697ea))
-
-  - **notifications**
-    - don't emit a notification if the last one was less than 250 ms ago and add a button to clear all notifications
-  ([b12b1074](https://mmorainville@bitbucket.org/mathieumorainville/netsix-vue/commits/b12b1074233262e007b27dbe7809d92ed3b697ea))
-
-  - **signaling**
-    - only allow two peers in a signaling channel
-  ([c0e01dc3](https://mmorainville@bitbucket.org/mathieumorainville/netsix-vue/commits/c0e01dc35adf5a74ebcd36807e36db50c7816fa6))
+  - add a tray icon to show/hide the main window
+  ([69b00c67](https://mmorainville@bitbucket.org/mathieumorainville/netsix-vue/commits/69b00c67cb4ffd047068cbb815f24884eeb689c7))
+
+  - **collections**
+    - add a button to open a local collection in the OS's explorer
+  ([f7f6de8c](https://mmorainville@bitbucket.org/mathieumorainville/netsix-vue/commits/f7f6de8ccca37537e39f4eeda0b90a8a9226c238))
+
+  - **options**
+    - add a modal to change some options
+  ([56ce5273](https://mmorainville@bitbucket.org/mathieumorainville/netsix-vue/commits/56ce5273f68763b2ae999dcdc5e0a423ebf3ee21))
+
+  - **video**
+    - inform the peer of the tracks that need to be transcoded
+  ([25595dc9](https://mmorainville@bitbucket.org/mathieumorainville/netsix-vue/commits/25595dc92a0f61b24ef352e0e5e0d275f6065289))
+    - display the transcoding progress and allow the user to cancel it
+  ([65b2f6c7](https://mmorainville@bitbucket.org/mathieumorainville/netsix-vue/commits/65b2f6c7a7d51eaac94fa6863adbad6ce5415cfd))
+    - add early support for MKV files and improve the way chunks are buffered
+  ([05504f09](https://mmorainville@bitbucket.org/mathieumorainville/netsix-vue/commits/05504f09335d04adf0ebe0b81d8d5e3b79d0ee6d))
+
+
+
+
+## Style
+  - use a percentage-based width for the grid containers on large screens
+  ([4b271727](https://mmorainville@bitbucket.org/mathieumorainville/netsix-vue/commits/4b2717271e9b3ee8d373773694bb2395087e8df9))
 
 
 
diff --git a/app/package.json b/app/package.json
index 07c5f82..37a86c5 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Netsix",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.6",
   "description": "Netsix allows you to share videos with your friends in a real peer-to-peer manner using WebRTC.",
   "main": "./dist/main.js",
   "dependencies": {