diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b8e8699..32d052bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,19 @@ 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.0.2 - 2017-07-24
+
+* Disable armel builds [Pablo Carranza Velez]
+* Disable pushing to registry.resinstaging.io, and use build environment to login to dockerhub [Pablo Carranza Velez]
+* Move dindctl to the base of the repository [Pablo Carranza Velez]
+* Add a script to automate the creation of meta-resin PRs [Pablo Carranza Velez]
+* Add a deploy-to-resin.js and automatically deploy to the Resin API on master builds [Pablo Carranza Velez]
+* Use a local supervisor image for the dind supervisor [Pablo Carranza Velez]
+* Replace the Jenkins build with a CircleCI build that uses the new multi-stage build [Pablo Carranza Velez]
+* Make dindctl an easier to use tool that takes options instead of using env vars [Pablo Carranza Velez]
+* Refactor the makefile to make it easier to use and make use of the multi-stage build [Pablo Carranza Velez]
+* Add a single Dockerfile to build the supervisor as a multi-stage build [Pablo Carranza Velez]
+
 ## v6.0.1 - 2017-07-12
 
 * Use webpack to join all modules [Pablo Carranza Velez]
diff --git a/package.json b/package.json
index 3f6b06be..d4a5bd1c 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.0.1",
+  "version": "6.0.2",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",