diff --git a/config/alfresco/extension/web-client-config-custom.xml.sample b/config/alfresco/extension/web-client-config-custom.xml.sample
new file mode 100644
index 0000000000..f2dd53dcab
--- /dev/null
+++ b/config/alfresco/extension/web-client-config-custom.xml.sample
@@ -0,0 +1,41 @@
+<alfresco-config>
+
+   <!-- The config below shows how to incorporate the -->
+   <!-- example model into the web client             -->
+   <!--
+   <config evaluator="string-compare" condition="Custom Content Types">
+      <content-types>
+         <type name="my:sop" />
+      </content-types>
+   </config>
+
+   <config evaluator="node-type" condition="my:sop">
+      <property-sheet>
+         <show-property name="name" showInEditMode="false" />
+         <show-property name="mimetype" displayLabelId="mimetype" converter="org.alfresco.faces.MimeTypeConverter" showInEditMode="false" />
+         <show-property name="title" showInEditMode="false" />
+         <show-property name="description" showInEditMode="false" />
+         <show-property name="size" displayLabelId="size" converter="org.alfresco.faces.ByteSizeConverter" showInEditMode="false" />
+         <show-property name="my:publishedDate" />
+         <show-association name="my:signOff" />
+         <show-property name="my:authorisedBy" />
+         <show-child-association name="my:processSteps" />
+      </property-sheet>
+   </config>
+
+   <config evaluator="aspect-name" condition="my:imageClassification">
+      <property-sheet>
+         <show-property name="my:width"/>
+         <show-property name="my:height"/>
+         <show-property name="my:resolution"/>
+      </property-sheet>
+   </config>
+
+   <config evaluator="string-compare" condition="Action Wizards">
+      <aspects>
+         <aspect name="my:imageClassification"/>
+      </aspects>
+   </config>
+   -->
+
+</alfresco-config>
diff --git a/project-build.xml b/project-build.xml
index 00eddd0442..9bb90a8bb9 100644
--- a/project-build.xml
+++ b/project-build.xml
@@ -51,6 +51,17 @@
          <fileset dir="${dir.project.remoteapi}/build/dist" includes="${dir.name.remoteapi}.jar" />
       </copy>
       
+      <!-- add config files to WEB-INF/classes -->
+      <copy todir="${dir.assemble}/WEB-INF/classes">
+         <fileset dir="${dir.config.repository}" excludes="**/*.sample" />
+         <fileset dir="${dir.config.webclient}" excludes="**/*.sample" />
+      </copy>
+      
+      <copy todir="${dir.assemble}/WEB-INF/classes/alfresco/messages">
+         <fileset dir="${dir.assemble}/WEB-INF/classes/alfresco/messages"/>
+         <mapper type="glob" from="*.properties" to="*_en_US.properties"/>
+      </copy>
+      
       <copy todir="${dir.assemble}/wsdl">
          <fileset dir="${dir.project.remoteapi}/source/wsdl" />
       </copy>
@@ -62,17 +73,6 @@
          <fileset dir="${dir.assemble}/WEB-INF" includes="${webinf.delete.tomcat}" />
       </delete>
       
-      <!-- add config files to WEB-INF/classes -->
-      <copy todir="${dir.assemble}/WEB-INF/classes">
-         <fileset dir="${dir.config.repository}"/>
-         <fileset dir="${dir.config.webclient}"/>
-      </copy>
-      
-      <copy todir="${dir.assemble}/WEB-INF/classes/alfresco/messages">
-         <fileset dir="${dir.assemble}/WEB-INF/classes/alfresco/messages"/>
-         <mapper type="glob" from="*.properties" to="*_en_US.properties"/>
-      </copy>
-      
       <copy todir="${dir.assemble}/WEB-INF/classes" file="${dir.project.core}/source/java/log4j.properties" />
    </target>
    
@@ -81,20 +81,6 @@
       <delete>
          <fileset dir="${dir.assemble}/WEB-INF/lib" includes="${webinf.lib.delete.jboss}" />
       </delete>
-
-      <!-- remove existing config files -->
-      <delete dir="${dir.deploy.jboss}/../conf/alfresco" quiet="yes"/>
-         
-      <!-- push externally visible config files into conf directory -->
-      <copy todir="${dir.deploy.jboss}/../conf" >
-         <fileset dir="${dir.config.repository}"/>
-         <fileset dir="${dir.config.webclient}"/>
-      </copy>
-      
-      <copy todir="${dir.deploy.jboss}/../conf/alfresco/messages">
-         <fileset dir="${dir.deploy.jboss}/../conf/alfresco/messages"/>
-         <mapper type="glob" from="*.properties" to="*_en_US.properties"/>
-      </copy>
    </target>
    
    <target name="clean" depends="common.clean" description="Cleans all the normal files plus web.xml">