diff --git a/HISTORY.md b/HISTORY.md
index eaa44ef11..c37ad63fe 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -11,6 +11,8 @@
   - udiff: A coder that uses unified diff format for code modifications.
   - help: Interactive help and documentation about aider.
   - ask: Ask questions about code without making any changes.
+- Add `file: CONVENTIONS.md` to `.aider.conf.yml` to always load a specific file.
+  - Or `file: [file1, file2, file3]` to always load multiple files.
 - Enhanced token usage and cost reporting. Now works when streaming too.
 - Filename auto-complete for `/add` and `/drop` is now case-insensitive.
 - Commit message improvements:
diff --git a/aider/website/HISTORY.md b/aider/website/HISTORY.md
index 284f558a2..cdb3a5450 100644
--- a/aider/website/HISTORY.md
+++ b/aider/website/HISTORY.md
@@ -22,6 +22,8 @@ cog.out(text)
   - udiff: A coder that uses unified diff format for code modifications.
   - help: Interactive help and documentation about aider.
   - ask: Ask questions about code without making any changes.
+- Add `file: CONVENTIONS.md` to `.aider.conf.yml` to always load a specific file.
+  - Or `file: [file1, file2, file3]` to always load multiple files.
 - Enhanced token usage and cost reporting. Now works when streaming too.
 - Filename auto-complete for `/add` and `/drop` is now case-insensitive.
 - Commit message improvements:
diff --git a/aider/website/assets/sample.aider.conf.yml b/aider/website/assets/sample.aider.conf.yml
index 654430e3b..525223c76 100644
--- a/aider/website/assets/sample.aider.conf.yml
+++ b/aider/website/assets/sample.aider.conf.yml
@@ -17,6 +17,9 @@
 #######
 # Main:
 
+## specify a file to edit (can be used multiple times)
+#file:
+
 ## Specify the OpenAI API key
 #openai-api-key:
 
diff --git a/aider/website/assets/sample.env b/aider/website/assets/sample.env
index d1313b931..8203c151c 100644
--- a/aider/website/assets/sample.env
+++ b/aider/website/assets/sample.env
@@ -21,6 +21,9 @@
 #######
 # Main:
 
+## specify a file to edit (can be used multiple times)
+#AIDER_FILE=
+
 ## Specify the OpenAI API key
 #OPENAI_API_KEY=
 
diff --git a/aider/website/docs/config/aider_conf.md b/aider/website/docs/config/aider_conf.md
index 621d8a9e9..20f1d517b 100644
--- a/aider/website/docs/config/aider_conf.md
+++ b/aider/website/docs/config/aider_conf.md
@@ -56,6 +56,9 @@ cog.outl("```")
 #######
 # Main:
 
+## specify a file to edit (can be used multiple times)
+#file:
+
 ## Specify the OpenAI API key
 #openai-api-key:
 
diff --git a/aider/website/docs/config/dotenv.md b/aider/website/docs/config/dotenv.md
index 932dcb767..6588b12ee 100644
--- a/aider/website/docs/config/dotenv.md
+++ b/aider/website/docs/config/dotenv.md
@@ -63,6 +63,9 @@ cog.outl("```")
 #######
 # Main:
 
+## specify a file to edit (can be used multiple times)
+#AIDER_FILE=
+
 ## Specify the OpenAI API key
 #OPENAI_API_KEY=
 
diff --git a/aider/website/docs/config/options.md b/aider/website/docs/config/options.md
index 211681488..d2c87a645 100644
--- a/aider/website/docs/config/options.md
+++ b/aider/website/docs/config/options.md
@@ -25,8 +25,8 @@ from aider.args import get_md_help
 cog.out(get_md_help())
 ]]]-->
 ```
-usage: aider [-h] [--openai-api-key] [--anthropic-api-key] [--model]
-             [--opus] [--sonnet] [--4] [--4o] [--4-turbo]
+usage: aider [-h] [--file] [--openai-api-key] [--anthropic-api-key]
+             [--model] [--opus] [--sonnet] [--4] [--4o] [--4-turbo]
              [--35turbo] [--models] [--openai-api-base]
              [--openai-api-type] [--openai-api-version]
              [--openai-api-deployment-id] [--openai-organization-id]
@@ -69,6 +69,10 @@ Aliases:
 
 ## Main:
 
+### `--file FILE`
+specify a file to edit (can be used multiple times)  
+Environment variable: `AIDER_FILE`  
+
 ### `--openai-api-key OPENAI_API_KEY`
 Specify the OpenAI API key  
 Environment variable: `OPENAI_API_KEY`