diff --git a/aspnet35.config b/aspnet35.config
index aa594f4af2..2eca4afb9a 100644
--- a/aspnet35.config
+++ b/aspnet35.config
@@ -36,8 +36,8 @@
     <add key="umbracoConfigurationStatus" value="" />
     <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
     <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
-    <add key="umbracoContentXML" value="~/data/umbraco.config" />
-    <add key="umbracoStorageDirectory" value="~/data" />
+    <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
+    <add key="umbracoStorageDirectory" value="~/App_Data" />
     <add key="umbracoPath" value="~/umbraco" />
     <add key="umbracoEnableStat" value="false" />
     <add key="umbracoHideTopLevelNodeFromPath" value="true" />
diff --git a/config templates/web.config b/config templates/web.config
index e186181b81..3f4d25bc19 100644
--- a/config templates/web.config	
+++ b/config templates/web.config	
@@ -21,8 +21,8 @@
     <add key="umbracoConfigurationStatus" value="" />
     <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx" />
     <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
-    <add key="umbracoContentXML" value="~/data/umbraco.config" />
-    <add key="umbracoStorageDirectory" value="~/data" />
+    <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
+    <add key="umbracoStorageDirectory" value="~/App_Data" />
     <add key="umbracoPath" value="~/umbraco" />
     <add key="umbracoEnableStat" value="false" />
     <add key="umbracoHideTopLevelNodeFromPath" value="true" />
diff --git a/umbraco/businesslogic/IO/SystemDirectories.cs b/umbraco/businesslogic/IO/SystemDirectories.cs
index d587cf7476..6d70c59fe1 100644
--- a/umbraco/businesslogic/IO/SystemDirectories.cs
+++ b/umbraco/businesslogic/IO/SystemDirectories.cs
@@ -40,7 +40,7 @@ namespace umbraco.IO
         {
             get
             {
-                return IOHelper.returnPath("umbracoStorageDirectory", "~/data");
+                return IOHelper.returnPath("umbracoStorageDirectory", "~/App_Data");
             }
         }
 
diff --git a/umbraco/businesslogic/IO/SystemFiles.cs b/umbraco/businesslogic/IO/SystemFiles.cs
index 00f108d847..285cb9d99d 100644
--- a/umbraco/businesslogic/IO/SystemFiles.cs
+++ b/umbraco/businesslogic/IO/SystemFiles.cs
@@ -83,7 +83,7 @@ namespace umbraco.IO
                 {
                     return Path.Combine(HttpRuntime.CodegenDir, @"UmbracoData\umbraco.config");
                 }
-                return IOHelper.returnPath("umbracoContentXML", "~/data/umbraco.config");
+                return IOHelper.returnPath("umbracoContentXML", "~/App_Data/umbraco.config");
             }
         }
 
diff --git a/umbraco/presentation/web.STANDARD.config b/umbraco/presentation/web.STANDARD.config
index f8152f33f1..3ef58f3797 100644
--- a/umbraco/presentation/web.STANDARD.config
+++ b/umbraco/presentation/web.STANDARD.config
@@ -35,8 +35,8 @@
     <add key="umbracoConfigurationStatus" value="4.1.0.betaII" />
     <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
     <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
-    <add key="umbracoContentXML" value="~/data/umbraco.config" />
-    <add key="umbracoStorageDirectory" value="~/data" />
+    <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
+    <add key="umbracoStorageDirectory" value="~/App_Data" />
     <add key="umbracoPath" value="~/umbraco" />
     <add key="umbracoEnableStat" value="false" />
     <add key="umbracoHideTopLevelNodeFromPath" value="true" />