diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml
new file mode 100644
index 0000000..17e76cb
--- /dev/null
+++ b/.github/workflows/commitlint.yml
@@ -0,0 +1,11 @@
+name: Lint Commit Messages
+on: [pull_request]
+
+jobs:
+  commitlint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: wagoid/commitlint-github-action@v4.1.12
diff --git a/commitlint.config.js b/commitlint.config.js
new file mode 100644
index 0000000..57eaed1
--- /dev/null
+++ b/commitlint.config.js
@@ -0,0 +1,5 @@
+/* eslint-disable import/no-extraneous-dependencies */
+
+module.exports = {
+  extends: ['@commitlint/config-conventional'],
+}