diff --git a/default.build b/default.build
index 0abbd56d7b..04904bb42f 100644
--- a/default.build
+++ b/default.build
@@ -8,7 +8,6 @@
     -->
     <property name="nant.settings.currentframework" value="net-4.0" />,
 
-
     <!-- filenames and directories, generally won't change -->
 
     <property name="web.dir" value="D:\inetpub\wwwroot\v4.umbraco.org" />
@@ -18,6 +17,9 @@
     <property name="build.dir" value="${root.dir}\build" />
     <property name="dlls.dir" value="${root.dir}\foreign dlls" />
 
+    <property name="WebPiAssets.dir" value="${root.dir}\config templates\WebPi" />
+    
+    
     <property name="build.version" value="4.6.1"/>
 
     <property name="build.configuration" value="Release"/>
@@ -355,7 +357,7 @@
     </target>
 
     <target name="webPIRelease" depends="release,webPiFile">
-        <copy file="${root.dir}\webPi_sha.txt" tofile="${public.dir}\${build.version}\webPi_sha.txt" />
+        <copy file="${root.dir}\webPi_sha.txt" tofile="${public.dir}\${build.version}\Umbraco_${build.version}_WebDeploy_sha.txt" />
         <copy file="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" tofile="${public.dir}\${build.version}\Umbraco_${build.version}_WebDeploy.zip" />
     </target>
 
@@ -370,15 +372,24 @@
         <mkdir dir="${webpi.dir}\umbraco" />
 
         <copy todir="${webpi.dir}\umbraco" includeemptydirs="true" >
-            <fileset basedir="${root.dir}">
-                <include name="build/*" />
-                <include name="build/**/*" />
+            <fileset basedir="${root.dir}\build">
+                <include name="*" />
+                <include name="**/*" />
             </fileset>
         </copy>
 
-        <copy file="d:\webpiAssets\installSQL.sql" tofile="${webpi.dir}\installSQL.sql" failonerror="false"/>
-        <copy file="d:\webpiAssets\manifest.xml" tofile="${webpi.dir}\manifest.xml" failonerror="false"/>
-        <copy file="d:\webpiAssets\parameters.xml" tofile="${webpi.dir}\parameters.xml" failonerror="false"/>
+        <copy todir="${webpi.dir}\umbraco\bin" includeemptydirs="true" >
+            <fileset basedir="${dlls.dir}\SQLCE4">
+                <include name="*" />
+                <include name="**/*" />
+            </fileset>
+        </copy>
+
+        <copy file="${root.dir}\components\SQLCE4Umbraco\bin\${build.configuration}\SQLCE4Umbraco.dll" tofile="${webpi.dir}\umbraco\bin\SQLCE4Umbraco.dll" failonerror="false" overwrite="true"/>
+        
+        <copy file="${WebPiAssets.dir}\installSQL.sql" tofile="${webpi.dir}\installSQL.sql" failonerror="false"/>
+        <copy file="${WebPiAssets.dir}\manifest.xml" tofile="${webpi.dir}\manifest.xml" failonerror="false"/>
+        <copy file="${WebPiAssets.dir}\parameters.xml" tofile="${webpi.dir}\parameters.xml" failonerror="false"/>
 
         <property name="webpi.filename" value="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" />
         <zip zipfile="${webpi.filename}" includeemptydirs="true" >
diff --git a/umbraco.sln b/umbraco.sln
index 040a81175a..d2f97ac4ff 100644
--- a/umbraco.sln
+++ b/umbraco.sln
@@ -110,6 +110,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.MacroEngines.Legacy
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.MacroEngines", "umbraco.MacroEngines.Juno\umbraco.MacroEngines.csproj", "{89C09045-1064-466B-B94A-DB3AFE2A5853}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebPi", "WebPi", "{AA6839DD-07D5-4277-915D-8C9290A36D5B}"
+EndProject
 Global
 	GlobalSection(TestCaseManagementSettings) = postSolution
 		CategoryFile = umbraco2.vsmdi
@@ -186,6 +188,7 @@ Global
 		{58072405-85D0-45CA-8F5C-EA8928C32A6A} = {F0242771-6DE6-4E03-BD3A-7B79BA79105B}
 		{F06D18F6-C510-4CBA-9514-0F890FD62103} = {F0242771-6DE6-4E03-BD3A-7B79BA79105B}
 		{19400916-4F71-45A0-B0E0-F9BE406D7772} = {F0242771-6DE6-4E03-BD3A-7B79BA79105B}
+		{AA6839DD-07D5-4277-915D-8C9290A36D5B} = {F0242771-6DE6-4E03-BD3A-7B79BA79105B}
 		{5BB61485-B480-4A03-A8DD-1636A5AF575C} = {B8ECDB8B-BF44-462C-B6DA-22421B3EC4D7}
 		{05329DB0-5C47-44A1-B7B8-BF377446BCD1} = {B8ECDB8B-BF44-462C-B6DA-22421B3EC4D7}
 		{C5FA9596-B9DC-4DF9-8380-AFC19C1EF51F} = {58072405-85D0-45CA-8F5C-EA8928C32A6A}