diff --git a/OpenSim/ApplicationPlugins/GridInfo/GridInfoPlugin.cs b/OpenSim/ApplicationPlugins/GridInfo/GridInfoPlugin.cs
index d8575d0b92..000fa52ce6 100644
--- a/OpenSim/ApplicationPlugins/GridInfo/GridInfoPlugin.cs
+++ b/OpenSim/ApplicationPlugins/GridInfo/GridInfoPlugin.cs
@@ -82,13 +82,14 @@ namespace OpenSim.ApplicationPlugins.GridInfo
                 }
                 _info["platform"] = "OpenSim";
                 
+                _httpd.AddXmlRPCHandler("get_grid_info", XmlRpcGridInfoMethod);
+
                 IConfig gridInfoConfig = _app.ConfigSource.Source.Configs["GridInfo"];
                 foreach (string k in gridInfoConfig.GetKeys())
                 {
                     _info[k] = gridInfoConfig.GetString(k);
                 }
                 
-                _httpd.AddXmlRPCHandler("get_grid_info", XmlRpcGridInfoMethod);
             }
             catch (NullReferenceException)
             {
diff --git a/bin/GridInfoPlugin.addin.xml b/bin/GridInfoPlugin.addin.xml
new file mode 100644
index 0000000000..ee75817ef7
--- /dev/null
+++ b/bin/GridInfoPlugin.addin.xml
@@ -0,0 +1,11 @@
+<Addin id="OpenSim.ApplicationPlugins.GridInfo" version="0.1">
+    <Runtime>
+        <Import assembly="OpenSim.ApplicationPlugins.GridInfo.dll"/>
+    </Runtime>
+    <Dependencies>
+        <Addin id="OpenSim" version="0.5" />
+    </Dependencies>
+    <Extension path = "/OpenSim/Startup">
+        <Type type="OpenSim.ApplicationPlugins.GridInfo.GridInfoPlugin" />
+    </Extension>
+</Addin>