diff --git a/.husky/commit-msg b/.husky/commit-msg
new file mode 100755
index 0000000..babe8fa
--- /dev/null
+++ b/.husky/commit-msg
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn commitlint --edit 
diff --git a/commitlint.config.js b/commitlint.config.js
new file mode 100644
index 0000000..ab24e3a
--- /dev/null
+++ b/commitlint.config.js
@@ -0,0 +1,3 @@
+export default {
+    extends: ['@commitlint/config-conventional']
+  };
\ No newline at end of file
diff --git a/package.json b/package.json
index 52a3aae..1e22a9c 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,8 @@
     "nostr-tools": "1.13.1"
   },
   "devDependencies": {
+    "@commitlint/cli": "^17.7.1",
+    "@commitlint/config-conventional": "^17.7.0",
     "@types/crypto-js": "^4.1.1",
     "@types/jest": "^29.4.0",
     "@types/node": "^18.11.0",