diff --git a/CHANGELOG.md b/CHANGELOG.md
index a732136e..9626bf49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## v1.5.2 - 2019-02-26
 
+- Enable versionist editVersion
+
 ## v1.5.1 - 2019-02-22
 
 ### Misc
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 4b0a094d..b83558e4 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "balena-etcher",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/versionist.conf.js b/versionist.conf.js
index dd1d5ad0..a3ecb8db 100644
--- a/versionist.conf.js
+++ b/versionist.conf.js
@@ -31,9 +31,7 @@ module.exports = {
     fromLine: 5
   },
 
-  includeCommitWhen: (commit) => {
-    return commit.footer['Changelog-entry']
-  },
+  includeCommitWhen: 'has-changelog-entry',
 
   getIncrementLevelFromCommit: (commit) => {
     if (/none/i.test(commit.footer['Change-type'])) {
@@ -44,6 +42,9 @@ module.exports = {
   },
 
   transformTemplateData: (data) => {
+    if (data.commits.length === 0) {
+      throw new Error('No commits annotated with Changelog-entry')
+    }
     data.features = data.commits.filter((commit) => {
       return commit.subject.type === 'feat'
     })