diff --git a/project.properties b/project.properties
index 836652924c..6d354fb696 100644
--- a/project.properties
+++ b/project.properties
@@ -1,4 +1,4 @@
 webinf.delete.tomcat=jboss*.xml,portlet*.xml,alfresco-object.xml
 webinf.lib.delete.jboss=log4j-1.2.8.jar,portlet-api-lib.jar,myfaces-api.jar,myfaces-impl.jar
 
-files.faces.config=/WEB-INF/faces-config-navigation.xml,/WEB-INF/faces-config-common.xml,/WEB-INF/faces-config-repo.xml
+files.faces.config=/WEB-INF/faces-config-app.xml,/WEB-INF/faces-config-beans.xml,/WEB-INF/faces-config-navigation.xml,/WEB-INF/faces-config-common.xml,/WEB-INF/faces-config-repo.xml
diff --git a/source/web/WEB-INF/faces-config-app.xml b/source/web/WEB-INF/faces-config-app.xml
new file mode 100644
index 0000000000..3637d56faa
--- /dev/null
+++ b/source/web/WEB-INF/faces-config-app.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+                              "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<faces-config>
+
+   <!-- ==================== APPLICATION ==================== -->
+   <application>
+      <navigation-handler>org.alfresco.web.app.AlfrescoNavigationHandler</navigation-handler>
+      <variable-resolver>org.springframework.web.jsf.DelegatingVariableResolver</variable-resolver>
+      <locale-config>
+         <default-locale>en</default-locale>
+      </locale-config>
+   </application>
+   
+   <!-- ==================== LIFECYCLE ==================== -->
+   <!--
+   <lifecycle>
+      <phase-listener>org.alfresco.web.app.DebugPhaseListener</phase-listener>
+   </lifecycle>
+   -->
+   
+</faces-config>
diff --git a/source/web/WEB-INF/faces-config.xml b/source/web/WEB-INF/faces-config-beans.xml
similarity index 96%
rename from source/web/WEB-INF/faces-config.xml
rename to source/web/WEB-INF/faces-config-beans.xml
index 504bc3663e..a951f0f46c 100644
--- a/source/web/WEB-INF/faces-config.xml
+++ b/source/web/WEB-INF/faces-config-beans.xml
@@ -3,16 +3,6 @@
                               "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
 <faces-config>
 
-   <!-- ==================== APPLICATION ==================== -->
-   <application>
-      <navigation-handler>org.alfresco.web.app.AlfrescoNavigationHandler</navigation-handler>
-      <variable-resolver>org.springframework.web.jsf.DelegatingVariableResolver</variable-resolver>
-      <locale-config>
-         <default-locale>en</default-locale>
-      </locale-config>
-   </application>
-   
-   
    <!-- ==================== MANAGED BEANS ==================== -->
    <managed-bean>
       <description>
@@ -1351,13 +1341,5 @@
          <value>#{NamespaceService}</value>
       </managed-property>
    </managed-bean>
-
-   <!-- ==================== LIFECYCLE ==================== -->
-
-   <!-- 
-   <lifecycle>
-      <phase-listener>org.alfresco.web.app.DebugPhaseListener</phase-listener>
-   </lifecycle>
-   -->
    
 </faces-config>