diff --git a/aider/website/assets/sample.aider.conf.yml b/aider/website/assets/sample.aider.conf.yml
index e5bc4ca95..24d525b32 100644
--- a/aider/website/assets/sample.aider.conf.yml
+++ b/aider/website/assets/sample.aider.conf.yml
@@ -207,10 +207,10 @@
 #version:
 
 ## Check for updates and return status in the exit code
-#check-update: false
+#just-check-update: false
 
-## Skips checking for the update when the program runs
-#skip-check-update: false
+## Check for new aider versions on launch
+#check-update: true
 
 ## Apply the changes from the given file instead of running the chat (debug)
 #apply:
diff --git a/aider/website/assets/sample.env b/aider/website/assets/sample.env
index f18c917e1..d1313b931 100644
--- a/aider/website/assets/sample.env
+++ b/aider/website/assets/sample.env
@@ -208,10 +208,10 @@
 #AIDER_VOICE_LANGUAGE=en
 
 ## Check for updates and return status in the exit code
-#AIDER_CHECK_UPDATE=false
+#AIDER_JUST_CHECK_UPDATE=false
 
-## Skips checking for the update when the program runs
-#AIDER_SKIP_CHECK_UPDATE=false
+## Check for new aider versions on launch
+#AIDER_CHECK_UPDATE=true
 
 ## Apply the changes from the given file instead of running the chat (debug)
 #AIDER_APPLY=
diff --git a/aider/website/docs/config/aider_conf.md b/aider/website/docs/config/aider_conf.md
index f7ebce607..3c7145560 100644
--- a/aider/website/docs/config/aider_conf.md
+++ b/aider/website/docs/config/aider_conf.md
@@ -246,10 +246,10 @@ cog.outl("```")
 #version:
 
 ## Check for updates and return status in the exit code
-#check-update: false
+#just-check-update: false
 
-## Skips checking for the update when the program runs
-#skip-check-update: false
+## Check for new aider versions on launch
+#check-update: true
 
 ## Apply the changes from the given file instead of running the chat (debug)
 #apply:
diff --git a/aider/website/docs/config/dotenv.md b/aider/website/docs/config/dotenv.md
index df54fd608..932dcb767 100644
--- a/aider/website/docs/config/dotenv.md
+++ b/aider/website/docs/config/dotenv.md
@@ -250,10 +250,10 @@ cog.outl("```")
 #AIDER_VOICE_LANGUAGE=en
 
 ## Check for updates and return status in the exit code
-#AIDER_CHECK_UPDATE=false
+#AIDER_JUST_CHECK_UPDATE=false
 
-## Skips checking for the update when the program runs
-#AIDER_SKIP_CHECK_UPDATE=false
+## Check for new aider versions on launch
+#AIDER_CHECK_UPDATE=true
 
 ## Apply the changes from the given file instead of running the chat (debug)
 #AIDER_APPLY=
diff --git a/aider/website/docs/config/options.md b/aider/website/docs/config/options.md
index 4a3aeed2b..211681488 100644
--- a/aider/website/docs/config/options.md
+++ b/aider/website/docs/config/options.md
@@ -51,10 +51,11 @@ usage: aider [-h] [--openai-api-key] [--anthropic-api-key] [--model]
              [--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] [--check-update]
-             [--skip-check-update] [--apply] [--yes] [-v]
-             [--show-repo-map] [--show-prompts] [--exit] [--message]
-             [--message-file] [--encoding] [-c] [--gui]
+             [--vim] [--voice-language] [--version]
+             [--just-check-update]
+             [--check-update | --no-check-update] [--apply] [--yes]
+             [-v] [--show-repo-map] [--show-prompts] [--exit]
+             [--message] [--message-file] [--encoding] [-c] [--gui]
 
 ```
 
@@ -396,15 +397,18 @@ Environment variable: `AIDER_VOICE_LANGUAGE`
 ### `--version`
 Show the version number and exit  
 
-### `--check-update`
+### `--just-check-update`
 Check for updates and return status in the exit code  
 Default: False  
-Environment variable: `AIDER_CHECK_UPDATE`  
+Environment variable: `AIDER_JUST_CHECK_UPDATE`  
 
-### `--skip-check-update`
-Skips checking for the update when the program runs  
-Default: False  
-Environment variable: `AIDER_SKIP_CHECK_UPDATE`  
+### `--check-update`
+Check for new aider versions on launch  
+Default: True  
+Environment variable: `AIDER_CHECK_UPDATE`  
+Aliases:
+  - `--check-update`
+  - `--no-check-update`
 
 ### `--apply FILE`
 Apply the changes from the given file instead of running the chat (debug)