diff --git a/CHANGES.md b/CHANGES.md
index e65b6f168..93777148b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -69,6 +69,7 @@ Changes from ns-3.39 to ns-3.40
 * (core) `EmpiricalRandomVariable` no longer requires that a CDF pair with a range value exactly equal to 1.0 be added (see issue #922).
 * (wifi) Upon ML setup, a non-AP MLD updates the IDs of the setup links to match the IDs used by the AP MLD.
 * (wifi) Attribute **TrackSignalsFromInactiveInterfaces** in SpectrumWifiPhy has been defaulted to be enabled.
+* (wifi) The default BlockAck buffer size is raised to the max value allowed by the supported standard
 
 Changes from ns-3.38 to ns-3.39
 -------------------------------
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 997ccd4ca..c6a0d0aff 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -23,6 +23,7 @@ Release 3-dev
 - (lr-wpan) !1686 - Change CapabilityField to standard bitmap
 - (lr-wpan) !1698 - Change SuperframeField to standard bitmap
 - (lr-wpan) !1706 - Create MAC layer abstraction (decoupling, alternative MACs)
+- (wifi) Added support for BlockAck buffer size of up to 1024 MPDUs (EHT STAs only)
 
 ### Bugs fixed
 
diff --git a/src/wifi/doc/source/wifi-user.rst b/src/wifi/doc/source/wifi-user.rst
index d900f07a3..bb6259470 100644
--- a/src/wifi/doc/source/wifi-user.rst
+++ b/src/wifi/doc/source/wifi-user.rst
@@ -856,14 +856,15 @@ attributes for 802.11ax devices.
  Ptr<HeConfiguration> heConfiguration = wnd->GetHeConfiguration();
  heConfiguration->SetGuardInterval(NanoSeconds(1600));
 
-802.11ax allows extended compressed Block ACKs containing a 256-bits bitmap, making
+802.11ax allows compressed Block ACKs containing a 256-bits bitmap, making
 possible transmissions of A-MPDUs containing up to 256 MPDUs, depending on the
 negotiated buffer size. In order to configure the buffer size of an 802.11ax device,
 the following line of code could be used:
 
 .. sourcecode:: cpp
 
- heConfiguration->SetMpduBufferSize(256);
+ WifiMacHelper mac;
+ mac.SetType("ns3::StaWifiMac", "MpduBufferSize", UintegerValue(256));
 
 For transmitting large MPDUs, it might also be needed to increase the maximum
 aggregation size (see above).