diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index b317db54dc..1be36ca851 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -160,6 +160,10 @@ namespace OpenSim
                 Environment.Exit(1);
             }
 
+            // Make sure command line options take precedence
+            //
+            m_config.Source.Merge(argvSource);
+
             ReadConfigSettings();
 
             return m_config;