diff --git a/xml/System.IO/FileStream.xml b/xml/System.IO/FileStream.xml
index e0da63c8c47..d0f90b0d83d 100644
--- a/xml/System.IO/FileStream.xml
+++ b/xml/System.IO/FileStream.xml
@@ -1218,7 +1218,7 @@ The file was too large (when <see cref="P:System.IO.FileStreamOptions.Preallocat
         <param name="mode">One of the enumeration values that determines how to open or create the file.</param>
         <param name="access">A bitwise combination of the enumeration values that determines how the file can be accessed by the <see langword="FileStream" /> object. This also determines the values returned by the <see cref="P:System.IO.FileStream.CanRead" /> and <see cref="P:System.IO.FileStream.CanWrite" /> properties of the <see langword="FileStream" /> object. <see cref="P:System.IO.FileStream.CanSeek" /> is <see langword="true" /> if <paramref name="path" /> specifies a disk file.</param>
         <param name="share">A bitwise combination of the enumeration values that determines how the file will be shared by processes.</param>
-        <param name="bufferSize">A positive <see cref="T:System.Int32" /> value greater than 0 indicating the buffer size. The default buffer size is 4096.</param>
+        <param name="bufferSize">A non-negative <see cref="T:System.Int32" /> value indicating the buffer size. The default buffer size is 4096. In versions earlier than .NET 6, this value must be greater than 0. In .NET 6 and later versions, a value of 0 disables buffering (a value of 1 disables buffering in every version).</param>
         <param name="options">A bitwise combination of the enumeration values that specifies additional file options.</param>
         <summary>Initializes a new instance of the <see cref="T:System.IO.FileStream" /> class with the specified path, creation mode, read/write and sharing permission, the access other FileStreams can have to the same file, the buffer size, and additional file options.</summary>
         <remarks>
@@ -1258,7 +1258,11 @@ The file was too large (when <see cref="P:System.IO.FileStreamOptions.Preallocat
         <exception cref="T:System.NotSupportedException">
           <paramref name="path" /> refers to a non-file device, such as "con:", "com1:", or "lpt1:", in a non-NTFS environment.</exception>
         <exception cref="T:System.ArgumentOutOfRangeException">
-          <paramref name="bufferSize" /> is negative or zero.
+          <paramref name="bufferSize" /> is negative.
+
+ -or-
+
+ <paramref name="bufferSize" /> is zero in versions earlier than .NET 6.
 
  -or-