diff --git a/tools-ng/common/xsl/build-template-6.4.xsl b/tools-ng/common/xsl/build-template-6.4.xsl
index edb7e722d..2efd1131e 100755
--- a/tools-ng/common/xsl/build-template-6.4.xsl
+++ b/tools-ng/common/xsl/build-template-6.4.xsl
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
+<!--  Template used up to ccm version 6.4 / aplaws 1.0..5 to create the build script.  -->
+
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:common="http://exslt.org/common"
diff --git a/tools-ng/common/xsl/build-template.xsl b/tools-ng/common/xsl/build-template.xsl
index 31ce28e0f..e350156ba 100755
--- a/tools-ng/common/xsl/build-template.xsl
+++ b/tools-ng/common/xsl/build-template.xsl
@@ -693,8 +693,13 @@
         <target depends="init" name="copy-src-{$name}">
           <copy todir="{$name}/${{build.classes.dir}}">
             <fileset dir="{$name}/${{src.dir}}">
+              <exclude name="**/overview.html"/>
               <exclude name="**/package.html"/>
               <exclude name="**/*.java"/>
+              <!-- exclude files which are no longer used - during
+                    transation and code clean-up phase only              -->
+              <exclude name="**/*.java.nolongerInUse"/>
+              <exclude name="**/**.nolongerInUse"/>
             </fileset>
           </copy>
         </target>
@@ -704,8 +709,12 @@
 
         <jar destfile="{$name}/${{build.dir}}/${{apps.{$name}.name}}-${{apps.{$name}.version}}.jar"
              update="true">
-          <fileset dir="{$name}/${{build.classes.dir}}"/>
-          <xsl:choose>
+          <fileset dir="{$name}/${{build.classes.dir}}">
+              <!-- exclude demo material to be included in jar (and war) files and war -->
+              <exclude name="**/demo**"/>
+              <exclude name="**/examples**"/>
+            </fileset>
+                        <xsl:choose>
             <xsl:when test="$haspdldir">
               <manifest>
                 <attribute name="Class-Path"