diff --git a/Spring.build b/Spring.build
index 96507790..006fad5e 100644
--- a/Spring.build
+++ b/Spring.build
@@ -725,8 +725,13 @@ Build properties that may be set:
       <arg value="-project=./doc/sdk/Spring.NET-net-2.0.ndoc" />
     </exec>
 
-    <!-- copy sdk docs -->
-    <copy todir="./doc/sdk/target/html">
+    <!-- copy sdk docs to final destination -->
+    <move todir="./doc/sdk/target/htmlhelp" overwrite="true">
+      <fileset basedir="./doc/sdk/target/tmp/">
+        <include name="*.chm"/>
+      </fileset>
+    </move>
+    <move todir="./doc/sdk/target/html" overwrite="true">
       <fileset basedir="./doc/sdk/target/tmp/">
         <include name="**/*"/>
         <exclude name="*.chw" />
@@ -736,15 +741,10 @@ Build properties that may be set:
         <exclude name="*.chm" />
         <exclude name="ndoc3_msdn_temp" />
       </fileset>
-    </copy>
-    <copy todir="./doc/sdk/target/htmlhelp">
-      <fileset basedir="./doc/sdk/target/tmp/">
-        <include name="*.chm"/>
-      </fileset>
-    </copy>
+    </move>
 
     <!-- clean tmp dir -->
-    <delete dir="./doc/sdk/target/tmp" failonerror="false" />
+    <!-- delete dir="./doc/sdk/target/tmp" failonerror="false" / -->
 
   </target>
 
diff --git a/build-support/tools/ndoc3/Interop.MSHelpCompiler.dll b/build-support/tools/ndoc3/Interop.MSHelpCompiler.dll
index 1c20f012..66961741 100644
Binary files a/build-support/tools/ndoc3/Interop.MSHelpCompiler.dll and b/build-support/tools/ndoc3/Interop.MSHelpCompiler.dll differ
diff --git a/build-support/tools/ndoc3/NDoc3.Core.dll b/build-support/tools/ndoc3/NDoc3.Core.dll
index 863a8cd6..19bb8b09 100644
Binary files a/build-support/tools/ndoc3/NDoc3.Core.dll and b/build-support/tools/ndoc3/NDoc3.Core.dll differ
diff --git a/build-support/tools/ndoc3/NDoc3.Core.pdb b/build-support/tools/ndoc3/NDoc3.Core.pdb
index a416d6ef..89e4af2d 100644
Binary files a/build-support/tools/ndoc3/NDoc3.Core.pdb and b/build-support/tools/ndoc3/NDoc3.Core.pdb differ
diff --git a/build-support/tools/ndoc3/NDoc3.Documenter.Msdn.dll b/build-support/tools/ndoc3/NDoc3.Documenter.Msdn.dll
index 7bd7d6ab..dfb98f4d 100644
Binary files a/build-support/tools/ndoc3/NDoc3.Documenter.Msdn.dll and b/build-support/tools/ndoc3/NDoc3.Documenter.Msdn.dll differ
diff --git a/build-support/tools/ndoc3/NDoc3.Documenter.Msdn.pdb b/build-support/tools/ndoc3/NDoc3.Documenter.Msdn.pdb
index 553d3384..ffc0a949 100644
Binary files a/build-support/tools/ndoc3/NDoc3.Documenter.Msdn.pdb and b/build-support/tools/ndoc3/NDoc3.Documenter.Msdn.pdb differ
diff --git a/build-support/tools/ndoc3/NDoc3.Documenter.Xml.dll b/build-support/tools/ndoc3/NDoc3.Documenter.Xml.dll
index 9fd29086..9c8fef74 100644
Binary files a/build-support/tools/ndoc3/NDoc3.Documenter.Xml.dll and b/build-support/tools/ndoc3/NDoc3.Documenter.Xml.dll differ
diff --git a/build-support/tools/ndoc3/NDoc3.Documenter.Xml.pdb b/build-support/tools/ndoc3/NDoc3.Documenter.Xml.pdb
index 749e1d19..ae426ca9 100644
Binary files a/build-support/tools/ndoc3/NDoc3.Documenter.Xml.pdb and b/build-support/tools/ndoc3/NDoc3.Documenter.Xml.pdb differ
diff --git a/build-support/tools/ndoc3/NDoc3.ExtendedUI.dll b/build-support/tools/ndoc3/NDoc3.ExtendedUI.dll
index 9cf911f2..3e3c446c 100644
Binary files a/build-support/tools/ndoc3/NDoc3.ExtendedUI.dll and b/build-support/tools/ndoc3/NDoc3.ExtendedUI.dll differ
diff --git a/build-support/tools/ndoc3/NDoc3.ExtendedUI.pdb b/build-support/tools/ndoc3/NDoc3.ExtendedUI.pdb
index 53b265d2..3dc49c58 100644
Binary files a/build-support/tools/ndoc3/NDoc3.ExtendedUI.pdb and b/build-support/tools/ndoc3/NDoc3.ExtendedUI.pdb differ
diff --git a/build-support/tools/ndoc3/NDoc3Console.exe b/build-support/tools/ndoc3/NDoc3Console.exe
index f5132a62..6afba568 100644
Binary files a/build-support/tools/ndoc3/NDoc3Console.exe and b/build-support/tools/ndoc3/NDoc3Console.exe differ
diff --git a/build-support/tools/ndoc3/NDoc3Console.pdb b/build-support/tools/ndoc3/NDoc3Console.pdb
index b171311c..a012fa3c 100644
Binary files a/build-support/tools/ndoc3/NDoc3Console.pdb and b/build-support/tools/ndoc3/NDoc3Console.pdb differ
diff --git a/build-support/tools/ndoc3/NDoc3Gui.exe b/build-support/tools/ndoc3/NDoc3Gui.exe
index 9f4863f1..d68fa93b 100644
Binary files a/build-support/tools/ndoc3/NDoc3Gui.exe and b/build-support/tools/ndoc3/NDoc3Gui.exe differ
diff --git a/build-support/tools/ndoc3/NDoc3Gui.pdb b/build-support/tools/ndoc3/NDoc3Gui.pdb
index 1d901370..03438d01 100644
Binary files a/build-support/tools/ndoc3/NDoc3Gui.pdb and b/build-support/tools/ndoc3/NDoc3Gui.pdb differ