diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 134190c441..2f5b5effec 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -78,6 +78,7 @@ jmeterthread.reversePostProcessors=true
 <li>Bug 39887 - jmeter.util.SSLManager: Couldn't load keystore error message</li>
 <li>Bug 41543 - exception when webserver returns "500 Internal Server Error" and content-length is 0</li>
 <li>Bug 41416 - don't use chunked input for text-box input in SOAP-RPC sampler</li>
+<li>Bug 39827 - SOAP Sampler content length for files</li>
 </ul>
 
 <h3>Version 2.2</h3>
diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 82575db778..d71bd84844 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -278,6 +278,13 @@ If a SOAP action is specified, that will override any SOAPaction in the HeaderMa
 The primary difference between the soap sampler and
 webservice sampler, is the soap sampler uses raw post and does not require conformance to
 XML.</p>
+<note>For versions of JMeter later than 2.2, the sampler no longer uses chunked encoding by default.<br/>
+For screen input, it now always uses the size of the data.<br/>
+File input uses the file length as determined by Java.<br/>
+On some OSes this may not work for all files, in which case add a child Header Manager
+with Content-Length set to the actual length of the file.<br/>
+Or set Content-Length to -1 to force chunked encoding.
+</note>
 </description>
 
 <properties>