diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs
index 0d21093eb4..c4602a8035 100644
--- a/OpenSim/Framework/PluginLoader.cs
+++ b/OpenSim/Framework/PluginLoader.cs
@@ -284,6 +284,11 @@ namespace OpenSim.Framework
 
         public bool Apply (ExtensionNode plugin)
         {
+            System.Console.WriteLine ("[WTF]: " + plugin.Path);
+
+            if (plugin.HasId == false)
+                return false;
+            
             return (plugin.Id == id);
         }
     }
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 0b4b4ac08e..ec3ca191e4 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -61,17 +61,6 @@ namespace OpenSim.Grid.GridServer
         /// <param name="provider">The name of the grid server plugin DLL</param>
         public void AddPlugin(string provider, string connect)
         {
-            // FIXME: convert "provider" DLL file name to Mono.Addins "id", 
-            // which unless it is changed in the source code, is the .NET namespace.
-            // In the future, the "provider" should be changed to "id" in the 
-            // config files, and is independent of filenames or namespaces.
-            string[] s = provider.Split ('.');
-            int len = s.Length;
-            if ((len >= 2) && (s [len-1] == "dll"))
-                s [len-1] = s [len-2];
-
-            provider = String.Join (".", s); 
-
             PluginLoader<IGridDataPlugin> gridloader = 
                 new PluginLoader<IGridDataPlugin> (new GridDataInitialiser (connect));
 
@@ -83,8 +72,8 @@ namespace OpenSim.Grid.GridServer
             
             // loader will try to load all providers (MySQL, MSSQL, etc) 
             // unless it is constrainted to the correct "id"
-            //gridloader.AddFilter ("/OpenSim/GridData", new PluginIdFilter (provider + "GridData"));
-            //logloader.AddFilter ("/OpenSim/LogData", new PluginIdFilter (provider + "LogData"));
+            gridloader.AddFilter ("/OpenSim/GridData", new PluginIdFilter (provider));
+            logloader.AddFilter ("/OpenSim/LogData", new PluginIdFilter (provider));
             
             gridloader.Load();
             logloader.Load();
diff --git a/bin/LoadRegionsPlugin.addin.xml b/bin/LoadRegionsPlugin.addin.xml
index 2bbffa6357..7fc38767c4 100644
--- a/bin/LoadRegionsPlugin.addin.xml
+++ b/bin/LoadRegionsPlugin.addin.xml
@@ -1,4 +1,4 @@
-<Addin>
+<Addin id="OpenSim.ApplicationPlugins.LoadRegions" version="0.1">
     <Runtime>
         <Import assembly="OpenSim.ApplicationPlugins.LoadRegions.dll"/>
     </Runtime>
diff --git a/bin/OpenSim.Data.MSSQL.addin.xml b/bin/OpenSim.Data.MSSQL.addin.xml
new file mode 100644
index 0000000000..b85c792e0a
--- /dev/null
+++ b/bin/OpenSim.Data.MSSQL.addin.xml
@@ -0,0 +1,14 @@
+<Addin id="OpenSim.Data.MSSQL" version="0.1">
+    <Runtime>
+        <Import assembly="OpenSim.Data.MSSQL.dll"/>
+    </Runtime>
+    <Dependencies>
+        <Addin id="OpenSim.Data" version="0.5" />
+    </Dependencies>
+    <Extension path = "/OpenSim/GridData">
+        <Type id="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLGridData" />
+    </Extension>
+    <Extension path = "/OpenSim/LogData">
+        <Type id="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLLogData" />
+    </Extension>
+</Addin>
diff --git a/bin/OpenSim.Data.MySQL.addin.xml b/bin/OpenSim.Data.MySQL.addin.xml
index ad861ea739..6dd4d75f5b 100644
--- a/bin/OpenSim.Data.MySQL.addin.xml
+++ b/bin/OpenSim.Data.MySQL.addin.xml
@@ -1,4 +1,4 @@
-<Addin>
+<Addin id="OpenSim.Data.MySQL" version="0.1">
     <Runtime>
         <Import assembly="OpenSim.Data.MySQL.dll"/>
     </Runtime>
@@ -6,9 +6,9 @@
         <Addin id="OpenSim.Data" version="0.5" />
     </Dependencies>
     <Extension path = "/OpenSim/GridData">
-        <Type type="OpenSim.Data.MySQL.MySQLGridData" />
+        <Type id="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLGridData" />
     </Extension>
     <Extension path = "/OpenSim/LogData">
-        <Type type="OpenSim.Data.MySQL.MySQLLogData" />
+        <Type id="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLLogData" />
     </Extension>
 </Addin>
diff --git a/bin/OpenSim.Data.SQLite.addin.xml b/bin/OpenSim.Data.SQLite.addin.xml
new file mode 100644
index 0000000000..ef254dc4bf
--- /dev/null
+++ b/bin/OpenSim.Data.SQLite.addin.xml
@@ -0,0 +1,11 @@
+<Addin id="OpenSim.Data.SQLite" version="0.1">
+    <Runtime>
+        <Import assembly="OpenSim.Data.SQLite.dll"/>
+    </Runtime>
+    <Dependencies>
+        <Addin id="OpenSim.Data" version="0.5" />
+    </Dependencies>
+    <Extension path = "/OpenSim/GridData">
+        <Type id="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteGridData" />
+    </Extension>
+</Addin>
diff --git a/bin/RemoteAdminPlugin.addin.xml b/bin/RemoteAdminPlugin.addin.xml
index b3fae6ca00..cb82ee0225 100644
--- a/bin/RemoteAdminPlugin.addin.xml
+++ b/bin/RemoteAdminPlugin.addin.xml
@@ -1,4 +1,4 @@
-<Addin>
+<Addin id="OpenSim.ApplicationPlugins.RemoteController" version="0.1">
     <Runtime>
         <Import assembly="OpenSim.ApplicationPlugins.RemoteController.dll"/>
     </Runtime>
diff --git a/bin/RestHandler.addin.xml b/bin/RestHandler.addin.xml
index 1e33193a77..1727c3b29c 100644
--- a/bin/RestHandler.addin.xml
+++ b/bin/RestHandler.addin.xml
@@ -1,4 +1,4 @@
-<Addin>
+<Addin id="OpenSim.ApplicationPlugins.Rest.Inventory" version="0.1">
     <Runtime>
         <Import assembly="OpenSim.ApplicationPlugins.Rest.Inventory.dll"/>
     </Runtime>
diff --git a/bin/RestRegionPlugin.addin.xml b/bin/RestRegionPlugin.addin.xml
index c0851928bd..91a6dd629b 100644
--- a/bin/RestRegionPlugin.addin.xml
+++ b/bin/RestRegionPlugin.addin.xml
@@ -1,4 +1,4 @@
-<Addin>
+<Addin id="OpenSim.ApplicationPlugins.Rest.Regions" version="0.1">
     <Runtime>
         <Import assembly="OpenSim.ApplicationPlugins.Rest.Regions.dll"/>
     </Runtime>