diff --git a/src/helma/main/Server.java b/src/helma/main/Server.java
index 2f7985b8..71e91a24 100644
--- a/src/helma/main/Server.java
+++ b/src/helma/main/Server.java
@@ -435,14 +435,21 @@ public class Server implements Runnable {
 
 
         // read db.properties file in helma home directory
+        String dbPropfile = sysProps.getProperty("dbPropFile");
+        File file;
+        if ((dbPropfile != null) && !"".equals(dbPropfile.trim())) {
+            file = new File(dbPropfile);
+        } else {
+            file = new File(hopHome, "db.properties");
+        }
+
         dbProps = new ResourceProperties();
         dbProps.setIgnoreCase(false);
-        dbProps.addResource(new FileResource(new File(hopHome, "db.properties")));
+        dbProps.addResource(new FileResource(file));
         DbSource.setDefaultProps(dbProps);
 
         // read apps.properties file
         String appsPropfile = sysProps.getProperty("appsPropFile");
-        File file;
         if ((appsPropfile != null) && !"".equals(appsPropfile.trim())) {
             file = new File(appsPropfile);
         } else {