diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe
index f3a79d8f..6f9b5825 100644
Binary files a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe and b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe differ
diff --git a/WebsitePanel/Sources/Tools/WSPTransportAgent/WSPTransportAgent.csproj b/WebsitePanel/Sources/Tools/WSPTransportAgent/WSPTransportAgent.csproj
index 20efc18d..5bc9a7ea 100644
--- a/WebsitePanel/Sources/Tools/WSPTransportAgent/WSPTransportAgent.csproj
+++ b/WebsitePanel/Sources/Tools/WSPTransportAgent/WSPTransportAgent.csproj
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>.\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/WebsitePanel/build.xml b/WebsitePanel/build.xml
index aacbfaf5..2b4a60a2 100644
--- a/WebsitePanel/build.xml
+++ b/WebsitePanel/build.xml
@@ -32,8 +32,7 @@
 		<ImportCsvSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.CsvBulk\bin\$(BuildConfiguration)</ImportCsvSrc>
 		<ImportEnterpriseSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.Enterprise\bin\$(BuildConfiguration)</ImportEnterpriseSrc>
 		<AWStatsViewerSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.AWStats.Viewer</AWStatsViewerSrc>
-
-<WSPTransportAgentSrc>$(TrunkFolder)\Sources\Tools\WSPTransportAgent</WSPTransportAgentSrc>
+		<WSPTransportAgentSrc>$(TrunkFolder)\Sources\Tools\WSPTransportAgent</WSPTransportAgentSrc>
 
 		<ServerBuild>$(BuildFolder)\Server</ServerBuild>
 		<EnterpriseServerBuild>$(BuildFolder)\EnterpriseServer</EnterpriseServerBuild>
@@ -41,8 +40,7 @@
 		<ImportCsvBuild>$(BuildFolder)\Import.CsvBulk</ImportCsvBuild>
 		<ImportEnterpriseBuild>$(BuildFolder)\Import.Enterprise</ImportEnterpriseBuild>
 		<AWStatsViewerBuild>$(BuildFolder)\AWStats.Viewer</AWStatsViewerBuild>
-
-<WSPTransportAgentBuild>$(BuildFolder)\WSPTransportAgent</WSPTransportAgentBuild>
+		<WSPTransportAgentBuild>$(BuildFolder)\WSPTransportAgent</WSPTransportAgentBuild>
 
 	</PropertyGroup>
 
@@ -59,7 +57,7 @@
 		<MSBuild Projects="$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.CsvBulk.sln" Properties="Configuration=$(BuildConfiguration)" />
 		<MSBuild Projects="$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.Enterprise.sln" Properties="Configuration=$(BuildConfiguration)" />
 		<MSBuild Projects="$(TrunkFolder)\Sources\Tools\WebsitePanel.AWStats.Viewer.sln" Properties="Configuration=$(BuildConfiguration)" />
-	<MSBuild Projects="$(TrunkFolder)\Sources\Tools\WSPTransportAgent.sln" Properties="Configuration=$(BuildConfiguration)" />
+		<MSBuild Projects="$(TrunkFolder)\Sources\Tools\WSPTransportAgent.sln" Properties="Configuration=$(BuildConfiguration)" />
   </Target>
 
 	<Target Name="PrepareBuilds" DependsOnTargets="CompileSources">
@@ -80,7 +78,7 @@
 		<MakeDir Directories="$(ImportCsvBuild)"/>
 		<MakeDir Directories="$(ImportEnterpriseBuild)"/>
 		<MakeDir Directories="$(AWStatsViewerBuild)"/>
-	<MakeDir Directories="$(WSPTransportAgentBuild)"/>
+		<MakeDir Directories="$(WSPTransportAgentBuild)"/>
 	</Target>
 
 	<Target Name="CreateServerBuild" DependsOnTargets="PrepareBuilds">
@@ -186,33 +184,29 @@
 		<Copy SourceFiles="@(AWStatsViewerBuildFiles)" DestinationFolder="$(AWStatsViewerBuild)\%(RecursiveDir)" />
 	</Target>
 
-	<Target Name="Build" DependsOnTargets="CreateAWStatsViewerBuild">
-		<!-- Do nothing -->
-	</Target>
-
-	<Target Name="CreateWSPTransportAgentBuild" DependsOnTargets="CreateImportEnterpriseBuild">
+	<Target Name="CreateWSPTransportAgentBuild" DependsOnTargets="CreateAWStatsViewerBuild">
     <ItemGroup>
-      <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\.svn\**" />
-      <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\obj\**" />
-      <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\bin\*.xml" />
-      <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\Release\**" />
-      <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\Debug\**" />
-      <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.pdb" Condition="'$(BuildConfiguration)' == 'Release'" />
-      <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.user" />
-      <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.suo" />
-      <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.cs" />
-      <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.csproj" />
-      <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\Code\**" />
-      <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.publish.xml" />
-      <WSPTransportAgentBuildFiles Include="$(WSPTransportAgentSrc)\**\*.*" Exclude="@(WSPTransportAgentBuildExclude)" />
+			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\.svn\**" />
+			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\obj\**" />
+			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\bin\*.xml" />
+			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.cache" />
+			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\app.config" />
+			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.txt" />
+			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.pdb" Condition="'$(BuildConfiguration)' == 'Release'" />
+			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.user" />
+			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.suo" />
+			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.cs" />
+			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.csproj" />
+			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\Code\**" />
+			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.publish.xml" />
+      			<WSPTransportAgentBuildFiles Include="$(WSPTransportAgentSrc)\**\*.*" Exclude="@(WSPTransportAgentBuildExclude)" />
     </ItemGroup>
     <Copy SourceFiles="@(WSPTransportAgentBuildFiles)" DestinationFolder="$(WSPTransportAgentBuild)\%(RecursiveDir)" />
   </Target>
 
-  <Target Name="Build" DependsOnTargets="CreateWSPTransportAgentBuild">
-    <!-- Do nothing -->
-  </Target>
-
+	<Target Name="Build" DependsOnTargets="CreateWSPTransportAgentBuild">
+		<!-- Do nothing -->
+	</Target>
 
   <!-- Create full distributives -->
 	<PropertyGroup>
@@ -227,7 +221,7 @@
 		<ImportCsvInstall>$(ToolsFolder)\Import.CsvBulk</ImportCsvInstall>
 		<ImportEnterpriseInstall>$(ToolsFolder)\Import.Enterprise</ImportEnterpriseInstall>
 		<AWStatsViewerInstall>$(ToolsFolder)\AWStats.Viewer</AWStatsViewerInstall>
-	<WSPTransportAgentInstall>$(ToolsFolder)\WSPTransportAgent</WSPTransportAgentInstall>
+		<WSPTransportAgentInstall>$(ToolsFolder)\WSPTransportAgent</WSPTransportAgentInstall>
     
 	</PropertyGroup>
 
@@ -296,7 +290,7 @@
 		<Copy SourceFiles="$(RootFolder)\LICENSE.txt" DestinationFolder="$(ImportEnterpriseInstall)" />
 	</Target>
 
-	<Target Name="CreateAWStatsViewerInstall" DependsOnTargets="CreateImportEnterpriseInstall">
+	<Target Name="CreateAWStatsViewerInstall" DependsOnTargets="CreateWSPTransportAgentInstall">
 		<ItemGroup>
 			<AWStatsViewerDeployFiles Include="$(AWStatsViewerBuild)\**\*.*" />
 		</ItemGroup>
@@ -306,6 +300,16 @@
 		<Copy SourceFiles="$(RootFolder)\LICENSE.txt" DestinationFolder="$(AWStatsViewerInstall)" />
 	</Target>
 
+	<Target Name="CreateWSPTransportAgentInstall" DependsOnTargets="CreateImportEnterpriseInstall">
+		<ItemGroup>
+			<WSPTransportAgentDeployFiles Include="$(WSPTransportAgentBuild)\**\*.*" />
+		</ItemGroup>
+		<RemoveDir Directories="$(WSPTransportAgentInstall)"/>
+		<MakeDir Directories="$(WSPTransportAgentInstall)"/>
+		<Copy SourceFiles="@(WSPTransportAgentDeployFiles)" DestinationFolder="$(WSPTransportAgentInstall)\%(RecursiveDir)" />
+		<Copy SourceFiles="$(RootFolder)\LICENSE.txt" DestinationFolder="$(WSPTransportAgentInstall)" />
+	</Target>
+
 	<!-- Create update from previous version -->
 	<PropertyGroup>
 		<UpdateFolder>$(DeployFolder)\Update</UpdateFolder>
@@ -426,6 +430,7 @@
 			<ImportCsvInstallFiles Include="$(ImportCsvInstall)\**\*.*" />
 			<ImportEnterpriseInstallFiles Include="$(ImportEnterpriseInstall)\**\*.*" />
 			<AWStatsViewerInstallFiles Include="$(AWStatsViewerInstall)\**\*.*" />
+			<WSPTransportAgentInstallFiles Include="$(WSPTransportAgentInstall)\**\*.*" />
 		</ItemGroup>
 
 		<!-- Assemble "Standalone" package -->
@@ -460,7 +465,7 @@
 		<Zip Files="@(ImportCsvInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-Import-CsvBulk-$(FileVersion).zip" WorkingDirectory="$(ImportCsvInstall)" />
 		<Zip Files="@(ImportEnterpriseInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-Import-Enterprise-$(FileVersion).zip" WorkingDirectory="$(ImportEnterpriseInstall)" />
 		<Zip Files="@(AWStatsViewerInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-AWStatsViewer-$(FileVersion).zip" WorkingDirectory="$(AWStatsViewerInstall)" />
-	<Zip Files="@(WSPTransportAgentInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(FileVersion).zip" WorkingDirectory="$(WSPTransportAgentInstall)" />
+		<Zip Files="@(WSPTransportAgentInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(FileVersion).zip" WorkingDirectory="$(WSPTransportAgentInstall)" />
   </Target>
 
 </Project>