diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index ffd91e50..276423c1 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,26 @@
+- commits:
+    - subject: 'Display command suggestions, when command not recognized'
+      hash: 273ea5ce4d5f169486f1e68be1157d7091338798
+      body: ''
+      footer:
+        Change-type: minor
+        change-type: minor
+        Signed-off-by: Scott Lowe <scott@balena.io>
+        signed-off-by: Scott Lowe <scott@balena.io>
+      author: Scott Lowe
+      nested: []
+    - subject: 'Convert help to oclif, remove capitano'
+      hash: d56fec6e36b88c1a1029858acfac7404080a1581
+      body: ''
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Scott Lowe <scott@balena.io>
+        signed-off-by: Scott Lowe <scott@balena.io>
+      author: Scott Lowe
+      nested: []
+  version: 12.17.0
+  date: 2020-09-07T12:45:01.828Z
 - commits:
     - subject: 'build, deploy: Add --pull option to force pulling base images again'
       hash: d1539f405aa2af75c8ccd3ae22e4e59c46c67d55
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5889068..9f7672fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ 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/).
 
+## 12.17.0 - 2020-09-07
+
+* Display command suggestions, when command not recognized [Scott Lowe]
+* Convert help to oclif, remove capitano [Scott Lowe]
+
 ## 12.16.0 - 2020-09-04
 
 * build, deploy: Add --pull option to force pulling base images again [Paulo Castro]
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index d112ef21..e62eafe4 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "balena-cli",
-  "version": "12.16.0",
+  "version": "12.17.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e3ef8aa0..21fd7c77 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "balena-cli",
-  "version": "12.16.0",
+  "version": "12.17.0",
   "description": "The official balena CLI tool",
   "main": "./build/app.js",
   "homepage": "https://github.com/balena-io/balena-cli",