diff --git a/README.md b/README.md
index 790ebd2..434c1c4 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@
 [![Coveralls](https://img.shields.io/coveralls/mike182uk/timestring/master.svg?style=flat-square)](https://coveralls.io/r/mike182uk/timestring)
 [![npm](https://img.shields.io/npm/dm/timestring.svg?style=flat-square)](https://www.npmjs.com/package/timestring)
 [![License](https://img.shields.io/github/license/mike182uk/timestring.svg?style=flat-square)](https://www.npmjs.com/package/timestring)
+[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=flat-square)](http://commitizen.github.io/cz-cli/)
 
 Parse a human readable time string into a time based value.
 
diff --git a/package.json b/package.json
index 06f4049..057f805 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "chai": "^3.4.1",
     "codeclimate-test-reporter": "^0.3.0",
     "coveralls": "^2.11.2",
+    "cz-conventional-changelog": "^1.1.5",
     "istanbul": "^0.4.1",
     "jscs": "^2.8.0",
     "jshint": "^2.9.1",
@@ -28,5 +29,10 @@
   },
   "dependencies": {
     "lodash": "^4.0.0"
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-conventional-changelog"
+    }
   }
-}
+}
\ No newline at end of file