diff --git a/WHATSNEW b/WHATSNEW
index bedfd6846..4e36ed613 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -129,6 +129,10 @@ Other changes:
 
 * fixcrlf can be used in a filterchain.
 
+* <sync> has a new nested element <preserveInTarget> that can be used
+  to protect extra-content in the target directory.  Bugzilla Report
+  21832.
+
 Changes from Ant 1.6.2 to current Ant 1.6 CVS version
 =====================================================
 
diff --git a/docs/manual/CoreTasks/sync.html b/docs/manual/CoreTasks/sync.html
index f3a4222e0..65b8e8f87 100644
--- a/docs/manual/CoreTasks/sync.html
+++ b/docs/manual/CoreTasks/sync.html
@@ -61,6 +61,7 @@ more filesets.</p>
     systems.  This can also be useful if source and target files live
     on separate machines with clocks being out of sync.  <em>since Ant
     1.6</em>.</td>
+     <td valign="top" align="center">No.</td>
   </tr>
 </table>
 
@@ -70,6 +71,41 @@ more filesets.</p>
 <p><a href="../CoreTypes/fileset.html">FileSet</a>s are used to select
 sets of files and directories.</p>
 
+<h4>preserveInTarget</h4>
+
+<p>Specifies files or directories that should be kept in the target
+directory even if they are not present in one of the source
+directories.</p>
+
+<p>This nested element is like a <a
+href="../CoreTypes/fileset.html">FileSet</a> except that it doesn't
+support the dir attribute and the usedefaultexcludes attribute
+defaults to false.</p>
+
+<h3>Examples</h3>
+
+<blockquote><pre>
+&lt;sync todir=&quot;site&quot;&gt;
+  &lt;fileset dir=&quot;generated-site&quot;/&gt;
+&lt;/sync&gt;
+</pre></blockquote>
+<p>overwrites all files in <em>site</em> with newer files from
+<em>generated-site</em>, deletes files from <em>site</em> that are not
+present in <em>generated-site</em>.</p>
+
+<blockquote><pre>
+&lt;sync todir=&quot;site&quot;&gt;
+  &lt;fileset dir=&quot;generated-site&quot;/&gt;
+  &lt;preserveintarget&gt;
+    &lt;include name=&quot;**/CVS/**&quot;/&gt;
+  &lt;/preserveintarget&gt;
+&lt;/sync&gt;
+</pre></blockquote>
+<p>overwrites all files in <em>site</em> with newer files from
+<em>generated-site</em>, deletes files from <em>site</em> that are not
+present in <em>generated-site</em> but keeps all files in any
+<em>CVS</em> sub-directory.</p>
+
 <hr>
 <p align="center">Copyright &copy; 2003-2005 The Apache Software Foundation. All rights
 Reserved.</p>