diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index ed556c1a2e..0aa59d7ff7 100644
--- a/source/web/WEB-INF/web.xml
+++ b/source/web/WEB-INF/web.xml
@@ -250,6 +250,38 @@
       <filter-name>Admin Authentication Filter</filter-name>
       <url-pattern>/faces/jsp/admin/system-info.jsp</url-pattern>
    </filter-mapping>
+   
+   <filter>
+      <description>Set HTTP cache Expires header 30 days forward for a mapping.</description>
+      <filter-name>CacheExpiresFilter</filter-name>
+      <filter-class>org.alfresco.web.scripts.servlet.StaticAssetCacheFilter</filter-class>
+      <init-param>
+         <description>Add an Expires Header 30 days forward</description>
+         <param-name>expires</param-name>
+         <param-value>30</param-value>
+      </init-param>
+   </filter>
+   
+   <filter-mapping>
+      <filter-name>CacheExpiresFilter</filter-name>
+      <url-pattern>*.jpg</url-pattern>
+   </filter-mapping>
+   <filter-mapping>
+      <filter-name>CacheExpiresFilter</filter-name>
+      <url-pattern>*.png</url-pattern>
+   </filter-mapping>
+   <filter-mapping>
+      <filter-name>CacheExpiresFilter</filter-name>
+      <url-pattern>*.gif</url-pattern>
+   </filter-mapping>
+   <filter-mapping>
+      <filter-name>CacheExpiresFilter</filter-name>
+      <url-pattern>*.css</url-pattern>
+   </filter-mapping>
+   <filter-mapping>
+      <filter-name>CacheExpiresFilter</filter-name>
+      <url-pattern>*.js</url-pattern>
+   </filter-mapping>
 
 
    <listener>