diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ddd68fa..d49318b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v6.3.6 - 2017-10-24
+
+* Ensure preloaded apps are properly loaded by setting their internal markedForDeletion to false, and run apps that have it set to null #510 [Pablo Carranza Velez]
+* Improve the check for when the device has been provisioned but the supervisor doesn't have knowledge of it in its local state #510 [Pablo Carranza Velez]
+* Ensure preloaded apps get the deviceApiKey in the env vars, and apps never get the provisioning key, and improve detection of cases when the device has been pre-provisioned #510 [Pablo Carranza Velez]
+
 ## v6.3.5 - 2017-10-19
 
 * Update docker-toolbelt to fix applying deltas on overlay2 with huge images #509 [Akis Kesoglou]
diff --git a/package.json b/package.json
index 4328e2de..7c234b45 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "resin-supervisor",
   "description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.",
-  "version": "6.3.5",
+  "version": "6.3.6",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",