diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 743a29cca..d8d6d64b7 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -164,6 +164,7 @@
     <Content Include="Themes\TheAdmin\Views\Layout.ascx" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="App_Data\Host.config" />
     <None Include="Themes\TheAdmin\Styles\images\icons.psd" />
     <Content Include="Themes\ClassicDark\Content\Images\bodyBackgroundgrey.gif" />
     <Content Include="Themes\ClassicDark\Content\Images\sidebarBackground.gif" />
@@ -341,7 +342,6 @@
     <Content Include="Themes\Web.config" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="App_Data\" />
     <Folder Include="Themes\ClassicDark\DesignerNotes\" />
     <Folder Include="Themes\SafeMode\Content\Images\" />
   </ItemGroup>
diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config
index f773df541..f1524c319 100644
--- a/src/Orchard.Web/Web.config
+++ b/src/Orchard.Web/Web.config
@@ -25,7 +25,7 @@
 
   <appSettings/>
 
-  <system.diagnostics configSource="Config\Diagnostics.config"/>
+  <system.diagnostics configSource="Config\Diagnostics.config" />
 
   <!-- 
         Set default transaction timeout to 30 minutes so that interactive debugging 
@@ -83,7 +83,7 @@
              passwordStrengthRegularExpression=""
              applicationName="/"
                 />-->
-        <add name="OrchardMembershipProvider" type="Orchard.Security.Providers.OrchardMembershipProvider, Orchard"
+        <add name="OrchardMembershipProvider" type="Orchard.Security.Providers.OrchardMembershipProvider, Orchard.Framework"
              applicationName="/" />
       </providers>
     </membership>
@@ -102,7 +102,7 @@
     <roleManager enabled="false">
       <providers>
         <clear />
-        <add name="OrchardRoleProvider" type="Orchard.Security.Providers.OrchardRoleProvider, Orchard"/>
+        <add name="OrchardRoleProvider" type="Orchard.Security.Providers.OrchardRoleProvider, Orchard.Framework"/>
         <add connectionStringName="ApplicationServices" applicationName="/" name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
         <add applicationName="/" name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
       </providers>
diff --git a/src/Orchard/Environment/Configuration/AzureBlobTenantManager.cs b/src/Orchard/Environment/Configuration/AzureBlobTenantManager.cs
new file mode 100644
index 000000000..778339afd
--- /dev/null
+++ b/src/Orchard/Environment/Configuration/AzureBlobTenantManager.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace Orchard.Environment.Configuration {
+    public class AzureBlobTenantManager : ITenantManager{
+        public AzureBlobTenantManager(string foo) {
+            int x = 5;
+        }
+
+        public string Foo { get; set; }
+
+        public IEnumerable<IShellSettings> LoadSettings() {
+            throw new NotImplementedException();
+        }
+
+        public void SaveSettings(IShellSettings settings) {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Orchard/Environment/OrchardStarter.cs b/src/Orchard/Environment/OrchardStarter.cs
index 324687510..d413c5119 100644
--- a/src/Orchard/Environment/OrchardStarter.cs
+++ b/src/Orchard/Environment/OrchardStarter.cs
@@ -1,5 +1,9 @@
 using System;
+using System.Configuration;
+using System.IO;
+using System.Web.Hosting;
 using Autofac;
+using Autofac.Configuration;
 using Autofac.Integration.Web;
 using Orchard.Environment.AutofacUtil;
 using Orchard.Environment.Configuration;
@@ -44,6 +48,15 @@ namespace Orchard.Environment {
 
             registrations(builder);
 
+            
+            var autofacSection = ConfigurationManager.GetSection(ConfigurationSettingsReader.DefaultSectionName);
+            if (autofacSection != null)
+                builder.RegisterModule(new ConfigurationSettingsReader());
+
+            var optionalHostConfig = HostingEnvironment.MapPath("~/App_Data/Host.config");
+            if (File.Exists(optionalHostConfig))
+                builder.RegisterModule(new ConfigurationSettingsReader(ConfigurationSettingsReader.DefaultSectionName, optionalHostConfig));
+
             return builder.Build();
         }
 
diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj
index df360af74..2b5c39d1c 100644
--- a/src/Orchard/Orchard.Framework.csproj
+++ b/src/Orchard/Orchard.Framework.csproj
@@ -35,6 +35,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\autofac\Autofac.dll</HintPath>
     </Reference>
+    <Reference Include="Autofac.Configuration, Version=2.1.13.813, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\autofac\Autofac.Configuration.dll</HintPath>
+    </Reference>
     <Reference Include="Autofac.Integration.Web, Version=2.1.13.813, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\autofac\Autofac.Integration.Web.dll</HintPath>
@@ -158,6 +162,7 @@
     <Compile Include="Environment\AutofacUtil\DynamicProxy2\DynamicProxyExtensions.cs" />
     <Compile Include="Environment\AutofacUtil\DynamicProxy2\ConstructorFinderWrapper.cs" />
     <Compile Include="Environment\Configuration\AppDataFolder.cs" />
+    <Compile Include="Environment\Configuration\AzureBlobTenantManager.cs" />
     <Compile Include="Environment\Configuration\DefaultTenantManager.cs" />
     <Compile Include="Environment\Configuration\ITenantManager.cs" />
     <Compile Include="Environment\AutofacUtil\ContainerUpdater.cs" />