diff --git a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
index 87c49d34a8..2eedebbf1a 100644
--- a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
+++ b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
@@ -65,6 +65,14 @@ namespace OpenSim.Services.Connectors
                     connString = dbConfig.GetString("ConnectionString", String.Empty);
             }
 
+            // Try reading the [EstateDataStore] section, if it exists
+            IConfig estConfig = config.Configs["EstateDataStore"];
+            if (estConfig != null)
+            {
+                dllName = estConfig.GetString("StorageProvider", dllName);
+                connString = dbConfig.GetString("ConnectionString", connString);
+            }
+
             // We tried, but this doesn't exist. We can't proceed
             if (dllName == String.Empty)
                 throw new Exception("No StorageProvider configured");
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
index 946f7e48e1..c8ecb18bbc 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
@@ -63,6 +63,14 @@ namespace OpenSim.Services.Connectors
                 connString = dbConfig.GetString("ConnectionString", String.Empty);
             }
 
+            // Try reading the [SimulationDataStore] section
+            IConfig simConfig = config.Configs["SimulationDataStore"];
+            if (simConfig != null)
+            {
+                dllName = simConfig.GetString("StorageProvider", dllName);
+                connString = simConfig.GetString("ConnectionString", connString);
+            }
+
             // We tried, but this doesn't exist. We can't proceed
             if (dllName == String.Empty)
                 throw new Exception("No StorageProvider configured");