diff --git a/commitlint.config.js b/commitlint.config.js
new file mode 100644
index 0000000000..5073c20db1
--- /dev/null
+++ b/commitlint.config.js
@@ -0,0 +1 @@
+module.exports = { extends: ["@commitlint/config-conventional"] };
diff --git a/package.json b/package.json
index c31e09afba..5ca1375b37 100644
--- a/package.json
+++ b/package.json
@@ -19,9 +19,11 @@
     "npm": ">=5.3.0"
   },
   "devDependencies": {
-    "@angular/core": "5.2.10",
     "@angular/compiler": "5.2.10",
     "@angular/compiler-cli": "5.2.10",
+    "@angular/core": "5.2.10",
+    "@commitlint/cli": "6.1.3",
+    "@commitlint/config-conventional": "6.1.3",
     "codelyzer": "4.3.0",
     "commitizen": "2.9.6",
     "cz-conventional-changelog": "2.1.0",
@@ -61,6 +63,7 @@
     "clean:modules:stark-testing": "cd packages/stark-testing && npm run clean:modules dist && cd ../..",
     "clean:modules:starter": "cd starter && npm run clean:modules dist && cd ..",
     "commit": "./node_modules/.bin/git-cz",
+    "commitmsg": "commitlint -e $GIT_PARAMS",
     "lint": "tslint --config tslint.json --project ./tsconfig.json --format codeFrame",
     "lint:stark-core": "cd packages/stark-core && npm run lint && cd ../..",
     "lint:starter": "cd starter && npm run lint && cd ..",