diff --git a/.github/commitlint.config.js b/.github/commitlint.config.js
new file mode 100644
index 0000000000..cf7daab867
--- /dev/null
+++ b/.github/commitlint.config.js
@@ -0,0 +1,44 @@
+module.exports = {
+	rules: {
+		'header-max-length': [2, 'always', 72],
+		'type-case': [2, 'always', 'lower-case'],
+		'type-empty': [2, 'never'],
+		'type-enum': [
+			2,
+			'always',
+			[
+				'babeld',
+				'bfdd',
+				'bgpd',
+				'doc',
+				'docker',
+				'eigrpd',
+				'fpm',
+				'isisd',
+				'ldpd',
+				'lib',
+				'multi',
+				'nhrpd',
+				'ospf6d',
+				'ospfd',
+				'pbrd',
+				'pimd',
+				'pim6d',
+				'ripd',
+				'ripngd',
+				'sharpd',
+				'staticd',
+				'tests',
+				'tools',
+				'vtysh',
+				'vrrpd',
+				'yang',
+				'zebra',
+				'all',
+			],
+		],
+		'subject-empty': [2, 'never'],
+		'subject-full-stop': [2, 'never', '.'],
+		'subject-case': [2, 'always', 'sentence-case'],
+	},
+};
diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml
new file mode 100644
index 0000000000..a1f273a2ce
--- /dev/null
+++ b/.github/workflows/commitlint.yml
@@ -0,0 +1,19 @@
+name: commitlint
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+
+jobs:
+  lint:
+    if: github.repository == 'frrouting/frr'
+    permissions:
+      contents: read
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Commit
+        uses: wagoid/commitlint-github-action@v5
+        with:
+          configFile: .github/commitlint.config.js