diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1efc37..c35c4b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,8 +10,8 @@
 
 ## Changes
 
-- The `-u` flag was changed to be equivalent to `-HI` (previously, a single `-u` was only equivalent to `-I`). Additional `-u` flags are still allowed, but ignored. See #840 and #986 (@jacksontheel)
 - Directories are now printed with an additional path separator at the end: `foo/bar/`, see #436 and #812 (@yyogo)
+- The `-u` flag was changed to be equivalent to `-HI` (previously, a single `-u` was only equivalent to `-I`). Additional `-u` flags are still allowed, but ignored. See #840 and #986 (@jacksontheel)
 
 ## Other
 
diff --git a/doc/fd.1 b/doc/fd.1
index a674b84..6144f73 100644
--- a/doc/fd.1
+++ b/doc/fd.1
@@ -416,7 +416,8 @@ Examples:
 .BI "\-\-batch-size " size
 Maximum number of arguments to pass to the command given with -X. If the number of results is
 greater than the given size, the command given with -X is run again with remaining arguments. A
-batch size of zero means there is no limit.
+batch size of zero means there is no limit (default), but note that batching might still happen
+due to OS restrictions on the maximum length of command lines.
 .SH PATTERN SYNTAX
 The regular expression syntax used by fd is documented here:
 
diff --git a/src/app.rs b/src/app.rs
index d7cdc3f..a9eba45 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -453,7 +453,9 @@ pub fn build_app() -> Command<'static> {
                 "Maximum number of arguments to pass to the command given with -X. \
                 If the number of results is greater than the given size, \
                 the command given with -X is run again with remaining arguments. \
-                A batch size of zero means there is no limit.",
+                A batch size of zero means there is no limit (default), but note \
+                that batching might still happen due to OS restrictions on the \
+                maximum length of command lines.",
             ),
         )
         .arg(