diff --git a/webapp/build.xml b/webapp/build.xml
index 1e137e708..0abb4fca8 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -140,6 +140,9 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 				-->
 				<exclude name="themes/**/*" if="skip.core.themes" />
 			</fileset>
+			<fileset dir="${appbase.dir}">
+				<include name="themes/**/*" />
+			</fileset>
 		</copy>
 
 		<copy todir="${war-webinf.dir}">
@@ -175,6 +178,7 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 
 		<!-- copy the context file into the war directory -->
 		<copy file="${appbase.dir}/context.xml" tofile="${war.dir}/META-INF/context.xml" />
+		
 	</target>
 
 	<!-- ================================= 
diff --git a/webapp/product-build.xml b/webapp/product-build.xml
index e8bb94805..15ad66502 100644
--- a/webapp/product-build.xml
+++ b/webapp/product-build.xml
@@ -102,6 +102,10 @@
 			<optionalDir primary="./test" />
 		</copy>
 
+		<copy todir="${appbase.dir}/themes">
+			<optionalDir primary="./themes" />
+		</copy>
+
 		<copy tofile="${appbase.dir}/context.xml" file="${inner.basedir}/context.xml" />
 	</target>
 	<!-- =================================