diff --git a/HISTORY.md b/HISTORY.md
index d37fab09a..55698ede6 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,17 @@
 
 # Release history
 
+### main branch
+
+- Infinite output for DeepSeek Coder, Mistral models in addition to Anthropic's models.
+- New `--chat-mode <mode>` switch to launch in ask/help/code modes.
+- New `/code <message>` command request a code edit while in `ask` mode.
+- Web scraper is more robust if page never idles.
+- Improvements and bug fixes for `/read` only files.
+- Bug fix to persist files added during `/ask`.
+- Bug fix for chat history size in `/tokens`.
+
+
 ### Aider v0.49.1
 
 - Bugfix to `/help`.
diff --git a/aider/website/HISTORY.md b/aider/website/HISTORY.md
index 9851d605f..703ffda6d 100644
--- a/aider/website/HISTORY.md
+++ b/aider/website/HISTORY.md
@@ -16,6 +16,17 @@ cog.out(text)
 
 # Release history
 
+### main branch
+
+- Infinite output for DeepSeek Coder, Mistral models in addition to Anthropic's models.
+- New `--chat-mode <mode>` switch to launch in ask/help/code modes.
+- New `/code <message>` command request a code edit while in `ask` mode.
+- Web scraper is more robust if page never idles.
+- Improvements and bug fixes for `/read` only files.
+- Bug fix to persist files added during `/ask`.
+- Bug fix for chat history size in `/tokens`.
+
+
 ### Aider v0.49.1
 
 - Bugfix to `/help`.
diff --git a/aider/website/assets/sample.aider.conf.yml b/aider/website/assets/sample.aider.conf.yml
index b771f791d..5ca6131a4 100644
--- a/aider/website/assets/sample.aider.conf.yml
+++ b/aider/website/assets/sample.aider.conf.yml
@@ -47,6 +47,9 @@
 ## Use gpt-3.5-turbo model for the main chat
 #35turbo: false
 
+## Use deepseek/deepseek-coder model for the main chat
+#deepseek: false
+
 #################
 # Model Settings:
 
diff --git a/aider/website/assets/sample.env b/aider/website/assets/sample.env
index a0f305388..cd1f49c44 100644
--- a/aider/website/assets/sample.env
+++ b/aider/website/assets/sample.env
@@ -51,6 +51,9 @@
 ## Use gpt-3.5-turbo model for the main chat
 #AIDER_35TURBO=
 
+## Use deepseek/deepseek-coder model for the main chat
+#AIDER_DEEPSEEK=
+
 #################
 # Model Settings:
 
diff --git a/aider/website/docs/config/aider_conf.md b/aider/website/docs/config/aider_conf.md
index e45b71f54..d3dfe6887 100644
--- a/aider/website/docs/config/aider_conf.md
+++ b/aider/website/docs/config/aider_conf.md
@@ -86,6 +86,9 @@ cog.outl("```")
 ## Use gpt-3.5-turbo model for the main chat
 #35turbo: false
 
+## Use deepseek/deepseek-coder model for the main chat
+#deepseek: false
+
 #################
 # Model Settings:
 
diff --git a/aider/website/docs/config/dotenv.md b/aider/website/docs/config/dotenv.md
index 380d7cabd..de1434641 100644
--- a/aider/website/docs/config/dotenv.md
+++ b/aider/website/docs/config/dotenv.md
@@ -93,6 +93,9 @@ cog.outl("```")
 ## Use gpt-3.5-turbo model for the main chat
 #AIDER_35TURBO=
 
+## Use deepseek/deepseek-coder model for the main chat
+#AIDER_DEEPSEEK=
+
 #################
 # Model Settings:
 
diff --git a/aider/website/docs/config/options.md b/aider/website/docs/config/options.md
index 331ec13e2..bdfadbdd4 100644
--- a/aider/website/docs/config/options.md
+++ b/aider/website/docs/config/options.md
@@ -27,7 +27,7 @@ cog.out(get_md_help())
 ```
 usage: aider [-h] [--openai-api-key] [--anthropic-api-key] [--model]
              [--opus] [--sonnet] [--4] [--4o] [--mini] [--4-turbo]
-             [--35turbo] [--models] [--openai-api-base]
+             [--35turbo] [--deepseek] [--models] [--openai-api-base]
              [--openai-api-type] [--openai-api-version]
              [--openai-api-deployment-id] [--openai-organization-id]
              [--model-settings-file] [--model-metadata-file]
@@ -118,6 +118,10 @@ Aliases:
   - `--3`
   - `-3`
 
+### `--deepseek`
+Use deepseek/deepseek-coder model for the main chat  
+Environment variable: `AIDER_DEEPSEEK`  
+
 ## Model Settings:
 
 ### `--models MODEL`