Index: java/org/apache/catalina/startup/CatalinaProperties.java
===================================================================
--- java/org/apache/catalina/startup/CatalinaProperties.java	(revision 901365)
+++ java/org/apache/catalina/startup/CatalinaProperties.java	(working copy)
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -58,7 +58,7 @@
      * Return specified property value.
      */
     public static String getProperty(String name) {
-	
+
         return properties.getProperty(name);
 
     }
@@ -98,7 +98,8 @@
             try {
                 File home = new File(getCatalinaBase());
                 File conf = new File(home, "conf");
-                File properties = new File(conf, "catalina.properties");
+                String configFilename = getConfigFilename();
+                File properties = new File(conf, configFilename);
                 is = new FileInputStream(properties);
             } catch (Throwable t) {
                 // Ignore
@@ -151,8 +152,8 @@
         return System.getProperty("catalina.home",
                                   System.getProperty("user.dir"));
     }
-    
-    
+
+
     /**
      * Get the value of the catalina.base environment variable.
      */
@@ -168,5 +169,10 @@
         return System.getProperty("catalina.config");
     }
 
-
+    /**
+     * Get the value of the configuration filename.
+     */
+    private static String getConfigFilename() {
+        return System.getProperty("catalina.config.filename", "catalina.properties");
+    }
 }
Index: webapps/docs/config/systemprops.xml
===================================================================
--- webapps/docs/config/systemprops.xml	(revision 901365)
+++ webapps/docs/config/systemprops.xml	(working copy)
@@ -222,11 +222,11 @@
       </li>
       <li>every request that is associated with a session will cause the
       session's last accessed time to be updated regardless of whether or not
-      the request explicitly accesses the session. (SRV.7.6)  
+      the request explicitly accesses the session. (SRV.7.6)
       </li>
       <li>
         cookies will be parsed strictly, by default v0 cookies will not work with any invalid characters.
-        <br/>If set to false, any v0 cookie with invalid character will be switched to a v1 cookie and 
+        <br/>If set to false, any v0 cookie with invalid character will be switched to a v1 cookie and
         the value will be quoted.
       </li>
       <li>
@@ -246,7 +246,7 @@
       one active request will always be considered valid. If not specified, the
       default value of <code>false</code> will be used.</p>
     </property>
-    
+
     <property
     name="org.apache.tomcat.util.http. ServerCookie.ALLOW_EQUALS_IN_VALUE">
       <p>If this is <code>true</code> Tomcat will allow <code>=</code>
@@ -293,7 +293,7 @@
       <p>An alternative name for the single sign on session cookie. Defaults to
       <code>JSESSIONIDSSO</code>.</p>
     </property>
-    
+
   </properties>
 
 </section>
@@ -333,6 +333,11 @@
       <p>The URL for the catalina.properties configuration file.</p>
     </property>
 
+    <property name="catalina.config.filename">
+      <p>Overrides the default name of "catalina.properties" with the name
+      specified here.</p>
+    </property>
+
     <property name="tomcat.util.buf.StringCache.byte.enabled">
       <p>If <code>true</code>, the String cache is enabled for
       <code>ByteChunk</code>. If not specified, the default value of