diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index b19e5491c7..6e7bd1c6d1 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -325,6 +325,8 @@ namespace OpenSim
                     Environment.Exit(1);
                 }
             }
+
+            configSource.Source.ExpandKeyValues();
             return success;
         }
 
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 6d8c2bf3d7..02ca13ef38 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -95,6 +95,16 @@
     ;; Place to create a PID file
     ; PIDFile = "/tmp/OpenSim.exe.pid"
 
+    ;# {RegistryLocation} {} {Addins Registry Location} {}
+    ; Set path to directory for addin registry if you want addins outside of bin.  
+    ; Information about the registered repositories and installed plugins will 
+    ; be stored here. The OpenSim.exe process must have R/W access to the location.
+    ; RegistryLocation = "."
+
+	;# {Include-Addins} {} {Loads all inis of all addins} {}
+    ; Leave this as is if you want 3rd-party addins to be automatically initialized.  
+    Include-Addins = "${RegistryLocation}/addins/*/*.ini"
+
     ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem
     ;; Determine where OpenSimulator looks for the files which tell it
     ;; which regions to server
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 3e9514ebbf..73fe59c233 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -75,7 +75,7 @@
     ; Set path to directory for plugin registry. Information about the 
     ; registered repositories and installed plugins will be stored here.
     ; The OpenSim.exe process must have R/W access to the location.
-    ; RegistryLocation = "."
+    RegistryLocation = "."
 
     ; ##
     ; ## CLIENTS
@@ -1877,3 +1877,4 @@
 
 [Modules]
     Include-modules = "addon-modules/*/config/*.ini"
+