diff --git a/tools-ng/common/xsl/build-template.xsl b/tools-ng/common/xsl/build-template.xsl
index 5bbc9ab97..a13618cf4 100755
--- a/tools-ng/common/xsl/build-template.xsl
+++ b/tools-ng/common/xsl/build-template.xsl
@@ -1337,14 +1337,38 @@
             </fileset>
       </copy>
 
-      <copy todir="${{this.deploy.dir}}" overwrite="yes">
+      <!-- Copy subdirectories templates and themes to web, but exclude
+           special directories ROOT and ERROR, which must be processed
+           separately.                                                       -->
+      <copy todir="${{this.deploy.dir}}" overwrite="yes" >
             <fileset dir="${{resolved.bundle.source.dir}}" >
                 <include name="templates/" />
                 <include name="themes/" />
-                <exclude name="**placeholder.info**" />
-                <exclude name="**README**" />
+                <exclude name="themes/placeholder.info" />
+                <exclude name="templates/placeholder.info" />
+                <exclude name="templates/ROOT/" />
+                <exclude name="templates/ERROR/" />
             </fileset>
       </copy>
+
+      <!-- Process special directory templates/ERROR
+           copy files to [docroot]/error                                    -->
+      <copy todir="${{this.deploy.dir}}/error" overwrite="yes" failonerror="false" >
+            <fileset dir="${{resolved.bundle.source.dir}}/templates/ERROR/" >
+                <include name="*" />
+                <exclude name="placeholder.info" />
+            </fileset>
+      </copy>
+
+      <!-- Process special directory templates/ROOT
+           copy files to document root (context root).                      -->
+      <copy todir="${{this.deploy.dir}}" overwrite="yes" failonerror="false" >
+            <fileset dir="${{resolved.bundle.source.dir}}/templates/ROOT/" >
+                <include name="*" />
+                <exclude name="placeholder.info" />
+            </fileset>
+      </copy>
+      
       
       <!-- Autogenerate from project.xml a file containing a space delimited
            list of package keys included in this build. Used during
diff --git a/tools-ng/ecdc/scriptlib/build-ccm.xml b/tools-ng/ecdc/scriptlib/build-ccm.xml
index 218ab1a30..4429b7340 100644
--- a/tools-ng/ecdc/scriptlib/build-ccm.xml
+++ b/tools-ng/ecdc/scriptlib/build-ccm.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--  Purpose:
+      ANT script to perform the various administration and maintenance tasks,
+      i.e.:
+      -  Various LOAD steps to load the database
+         most prominent: load-bundle
+      -  UPGRADE tasks to run SQL upgrade scripts
+      -  RUN-CCM task to run various CLI utility classes 
+-->
+
 <!--  Already definded:
 		ccm.project.dir:		base dir of the development project
 		app.server.bundles.zip	name of the installation file