diff --git a/HISTORY.md b/HISTORY.md
index 8b07576c3..7a0d766d7 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,15 +3,17 @@
 
 ## main branch
 
-- Switching to code and ask mode no longer summarizes the chat history.
-- Added Conventional Commits guidelines to commit message prompt.
+- Commit message improvements:
+  - Added Conventional Commits guidelines to commit message prompt.
+  - Added `--commit-prompt` to customize the commit message prompt.
+  - Added strong model as a fallback for commit messages (and chat summaries).
 - Linting improvements:
   - Ask before fixing lint errors.
   - Improved performance of `--lint` on all dirty files in repo.
   - Improved lint flow, now doing code edit auto-commit before linting.
   - Bugfix to properly handle subprocess encodings (also for `/run`).
-- New aider-full docker image, which includes all extras.
-- Added strong model as a fallback for commit messages and chat summaries.
+- New paul-gauthier/aider-full docker image, which includes all extras.
+- Switching to code and ask mode no longer summarizes the chat history.
 - Added graph of aider's contribution to each release.
 - Generic auto-completions are provided for `/commands` without a completion override.
 - Fixed broken OCaml tags file.
diff --git a/aider/website/assets/sample.aider.conf.yml b/aider/website/assets/sample.aider.conf.yml
index 525223c76..481d3f600 100644
--- a/aider/website/assets/sample.aider.conf.yml
+++ b/aider/website/assets/sample.aider.conf.yml
@@ -170,6 +170,9 @@
 ## Prefix commit messages with 'aider: ' (default: False)
 #attribute-commit-message: false
 
+## Specify a custom prompt for generating commit messages
+#commit-prompt:
+
 ## Perform a dry run without modifying files (default: False)
 #dry-run: false
 
diff --git a/aider/website/assets/sample.env b/aider/website/assets/sample.env
index 8203c151c..592888dd8 100644
--- a/aider/website/assets/sample.env
+++ b/aider/website/assets/sample.env
@@ -174,6 +174,9 @@
 ## Prefix commit messages with 'aider: ' (default: False)
 #AIDER_ATTRIBUTE_COMMIT_MESSAGE=false
 
+## Specify a custom prompt for generating commit messages
+#AIDER_COMMIT_PROMPT=
+
 ## Perform a dry run without modifying files (default: False)
 #AIDER_DRY_RUN=false
 
diff --git a/aider/website/docs/config/aider_conf.md b/aider/website/docs/config/aider_conf.md
index 20f1d517b..1038c63f8 100644
--- a/aider/website/docs/config/aider_conf.md
+++ b/aider/website/docs/config/aider_conf.md
@@ -209,6 +209,9 @@ cog.outl("```")
 ## Prefix commit messages with 'aider: ' (default: False)
 #attribute-commit-message: false
 
+## Specify a custom prompt for generating commit messages
+#commit-prompt:
+
 ## Perform a dry run without modifying files (default: False)
 #dry-run: false
 
diff --git a/aider/website/docs/config/dotenv.md b/aider/website/docs/config/dotenv.md
index 6588b12ee..a5936bd23 100644
--- a/aider/website/docs/config/dotenv.md
+++ b/aider/website/docs/config/dotenv.md
@@ -216,6 +216,9 @@ cog.outl("```")
 ## Prefix commit messages with 'aider: ' (default: False)
 #AIDER_ATTRIBUTE_COMMIT_MESSAGE=false
 
+## Specify a custom prompt for generating commit messages
+#AIDER_COMMIT_PROMPT=
+
 ## Perform a dry run without modifying files (default: False)
 #AIDER_DRY_RUN=false
 
diff --git a/aider/website/docs/config/options.md b/aider/website/docs/config/options.md
index d2c87a645..e351b250d 100644
--- a/aider/website/docs/config/options.md
+++ b/aider/website/docs/config/options.md
@@ -48,8 +48,8 @@ usage: aider [-h] [--file] [--openai-api-key] [--anthropic-api-key]
              [--attribute-author | --no-attribute-author]
              [--attribute-committer | --no-attribute-committer]
              [--attribute-commit-message | --no-attribute-commit-message]
-             [--dry-run | --no-dry-run] [--commit] [--lint]
-             [--lint-cmd] [--auto-lint | --no-auto-lint]
+             [--commit-prompt] [--dry-run | --no-dry-run] [--commit]
+             [--lint] [--lint-cmd] [--auto-lint | --no-auto-lint]
              [--test-cmd] [--auto-test | --no-auto-test] [--test]
              [--vim] [--voice-language] [--version]
              [--just-check-update]
@@ -335,6 +335,10 @@ Aliases:
   - `--attribute-commit-message`
   - `--no-attribute-commit-message`
 
+### `--commit-prompt PROMPT`
+Specify a custom prompt for generating commit messages  
+Environment variable: `AIDER_COMMIT_PROMPT`  
+
 ### `--dry-run`
 Perform a dry run without modifying files (default: False)  
 Default: False