diff --git a/.changes/header.tpl.md b/.changes/header.tpl.md
new file mode 100644
index 000000000..df8faa7b2
--- /dev/null
+++ b/.changes/header.tpl.md
@@ -0,0 +1,6 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
+and is generated by [Changie](https://github.com/miniscruff/changie).
diff --git a/.changes/unreleased/.gitkeep b/.changes/unreleased/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.changie.yaml b/.changie.yaml
new file mode 100644
index 000000000..bf5f72b64
--- /dev/null
+++ b/.changie.yaml
@@ -0,0 +1,26 @@
+changesDir: .changes
+unreleasedDir: unreleased
+headerPath: header.tpl.md
+changelogPath: CHANGELOG.md
+versionExt: md
+versionFormat: '## {{.Version}} - {{.Time.Format "2006-01-02"}}'
+kindFormat: "### {{.Kind}}"
+changeFormat: "* {{.Body}}"
+kinds:
+    - label: Added
+      auto: minor
+    - label: Changed
+      auto: major
+    - label: Deprecated
+      auto: minor
+    - label: Removed
+      auto: major
+    - label: Fixed
+      auto: patch
+    - label: Security
+      auto: patch
+newlines:
+    afterChangelogHeader: 1
+    beforeChangelogVersion: 1
+    endOfVersion: 1
+envPrefix: CHANGIE_
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c003c7ec..8a1473d1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,10 @@
-# Change Log
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
+and is generated by [Changie](https://github.com/miniscruff/changie).
+
 
 ## [3.2.6]
 
diff --git a/package-lock.json b/package-lock.json
index 8962955ab..d1201009d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "claude-dev",
-	"version": "3.2.5",
+	"version": "3.2.6",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "claude-dev",
-			"version": "3.2.5",
+			"version": "3.2.6",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"@anthropic-ai/bedrock-sdk": "^0.10.2",
@@ -61,6 +61,7 @@
 				"@vscode/test-cli": "^0.0.9",
 				"@vscode/test-electron": "^2.4.0",
 				"chai": "^4.3.10",
+				"changie": "^1.21.0",
 				"esbuild": "^0.21.5",
 				"eslint": "^8.57.0",
 				"husky": "^9.1.7",
@@ -6007,6 +6008,16 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/changie": {
+			"version": "1.21.0",
+			"resolved": "https://registry.npmjs.org/changie/-/changie-1.21.0.tgz",
+			"integrity": "sha512-fLK0oRtjImao22BDjaaXLq9w/hMh7mGdzpRrJ5ADzT0SOSIghT0SrVOhSs9tUCoyPa2fjG05ueVZSLcSXGBeVg==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"changie": "npm/changie.js"
+			}
+		},
 		"node_modules/check-error": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
diff --git a/package.json b/package.json
index ec56603bc..efa62b021 100644
--- a/package.json
+++ b/package.json
@@ -186,7 +186,8 @@
 		"test:webview": "cd webview-ui && npm run test",
 		"publish:marketplace": "vsce publish && ovsx publish",
 		"publish:marketplace:prerelease": "vsce publish --pre-release && ovsx publish --pre-release",
-		"prepare": "husky"
+		"prepare": "husky",
+		"changie": "changie"
 	},
 	"devDependencies": {
 		"@types/chai": "^5.0.1",
@@ -200,6 +201,7 @@
 		"@vscode/test-cli": "^0.0.9",
 		"@vscode/test-electron": "^2.4.0",
 		"chai": "^4.3.10",
+		"changie": "^1.21.0",
 		"esbuild": "^0.21.5",
 		"eslint": "^8.57.0",
 		"husky": "^9.1.7",