diff --git a/src/main/java/org/alfresco/repo/descriptor/ServerDescriptorDAOImpl.java b/src/main/java/org/alfresco/repo/descriptor/ServerDescriptorDAOImpl.java
index 128b13d64f..0a21c7277d 100644
--- a/src/main/java/org/alfresco/repo/descriptor/ServerDescriptorDAOImpl.java
+++ b/src/main/java/org/alfresco/repo/descriptor/ServerDescriptorDAOImpl.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.descriptor;
 
 import java.io.IOException;
@@ -62,22 +62,25 @@ public class ServerDescriptorDAOImpl implements DescriptorDAO
     /**
      * Sets the server descriptor from a resource file.
      * 
-     * @param descriptorResource
-     *            resource containing server descriptor meta-data
+     * @param locations
+     *            resources containing server descriptor meta-data
      * @throws IOException
      *             Signals that an I/O exception has occurred.
      */
-    public void setResource(final Resource descriptorResource) throws IOException
+    public void setResource(final Resource[] locations) throws IOException
     {
         this.serverProperties = new Properties();
-        InputStream is = descriptorResource.getInputStream();
-        try
+        for (int i=0; i< locations.length; i++)
         {
-            this.serverProperties.load(is);
-        }
-        finally
-        {
-            if (is != null) try { is.close(); } catch (IOException e) {}
+            InputStream is = locations[i].getInputStream();
+            try
+            {
+                this.serverProperties.load(is);
+            }
+            finally
+            {
+                if (is != null) try { is.close(); } catch (IOException e) {}
+            }
         }
     }
 
diff --git a/src/main/resources/alfresco/core-services-context.xml b/src/main/resources/alfresco/core-services-context.xml
index 88a130d519..4a9d89ed12 100644
--- a/src/main/resources/alfresco/core-services-context.xml
+++ b/src/main/resources/alfresco/core-services-context.xml
@@ -855,12 +855,15 @@
     </bean>
 
     <bean id="serverDescriptorDAO" class="org.alfresco.repo.descriptor.ServerDescriptorDAOImpl">
-       <property name="repositoryName">
-           <value>${repository.name}</value>
-       </property>
-       <property name="resource">
-           <value>classpath:alfresco/version.properties</value>
-       </property>
+        <property name="repositoryName">
+            <value>${repository.name}</value>
+        </property>
+        <property name="resource">
+            <list>
+                <value>classpath:alfresco/version.properties</value>
+                <value>classpath:alfresco/repository.properties</value>
+            </list>
+        </property>
     </bean>
 
     <bean id="currentRepoDescriptorDAO" class="org.alfresco.repo.descriptor.RepositoryDescriptorDAOImpl">