diff --git a/build/Common.targets b/build/Common.targets
index e26bc07a2c..8b4238731c 100644
--- a/build/Common.targets
+++ b/build/Common.targets
@@ -34,14 +34,19 @@
 	</Target>
 	
 	<!--## Package Generation ##-->
+	<Target Name="_CleanOutputDirectory">
+		<ItemGroup><DirectoriesToDelete Include="$([System.IO.Directory]::GetDirectories('$(BuildOutputDirectory)'))" /></ItemGroup>
+		<RemoveDir Directories="@(DirectoriesToDelete)" ContinueOnError="true" />
+		
+		<ItemGroup><FilesToDelete Include="$(BuildOutputDirectory)\**\*.*" /></ItemGroup>
+		<Delete Files="@(FilesToDelete)" />
+	</Target>
+	
 	<Target Name="_PreparePackageComponent">
 		<Copy SourceFiles="@(DynamicPackageItem)" DestinationFolder="$(BuildOutputDirectory)\%(DynamicPackageItem.TargetDirectory)\%(DynamicPackageItem.RecursiveDir)" />
 	</Target>
 
 	<Target Name="_GeneratePackage">
-		<ItemGroup><ExistingArchives Include="$(BuildOutputDirectory)\*.zip" /></ItemGroup>
-		<Delete Files="@(ExistingArchives)" />
-
 		<Copy SourceFiles="@(StaticPackageItem)" DestinationFolder="$(BuildOutputDirectory)\%(StaticPackageItem.TargetDirectory)\%(StaticPackageItem.RecursiveDir)" />
 		<Exec Command="&quot;$(ZipExePath)&quot; a -tzip $(PackageName) * -r" WorkingDirectory="$(BuildOutputDirectory)" />
 
diff --git a/build/GenerateCompletePackage.bat b/build/GenerateCompletePackage.bat
index 63a0d29e93..959dc788b5 100644
--- a/build/GenerateCompletePackage.bat
+++ b/build/GenerateCompletePackage.bat
@@ -1,4 +1,7 @@
 @ECHO OFF
+%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:PrepareOutputDirectory
+IF ERRORLEVEL 1 GOTO END
+
 %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build;PreparePackageComponent /p:BuildConfiguration=Debug /p:Platform="Any CPU"
 IF ERRORLEVEL 1 GOTO END
 
diff --git a/build/GenerateReleasePackage.bat b/build/GenerateReleasePackage.bat
index 30e05bad83..70111b74c1 100644
--- a/build/GenerateReleasePackage.bat
+++ b/build/GenerateReleasePackage.bat
@@ -1,4 +1,7 @@
 @ECHO OFF
+%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:PrepareOutputDirectory
+IF ERRORLEVEL 1 GOTO END
+
 %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build;PreparePackageComponent /p:BuildConfiguration=Release /p:Platform="Any CPU"
 IF ERRORLEVEL 1 GOTO END
 
diff --git a/build/build.csproj b/build/build.csproj
index 50e2207a31..7bc65894f2 100644
--- a/build/build.csproj
+++ b/build/build.csproj
@@ -95,6 +95,7 @@
 
 	<!-- targets -->
 	<Target Name="Build" DependsOnTargets="_Compile;_Test" />
+	<Target Name="PrepareOutputDirectory" DependsOnTargets="_CleanOutputDirectory" />
 	<Target Name="PreparePackageComponent" DependsOnTargets="_PreparePackageComponent" />
 	<Target Name="GeneratePackage" DependsOnTargets="_GeneratePackage" />
 	<Target Name="RunBenchmarks" DependsOnTargets="_RunBenchmarks" />