diff --git a/.gitignore b/.gitignore
index 12952fa2d..f7f48e507 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,3 +135,5 @@ UpgradeLog*.htm
 NzbDrone.Backbone/templates.js
 NzbDrone.Backbone/Content/bootstrap.css
 _output/
+_rawPackage/
+NzbDrone.zip
diff --git a/ServiceHelpers/ServiceInstall/ServiceInstall.csproj b/ServiceHelpers/ServiceInstall/ServiceInstall.csproj
index 71ea64baf..4b94beda8 100644
--- a/ServiceHelpers/ServiceInstall/ServiceInstall.csproj
+++ b/ServiceHelpers/ServiceInstall/ServiceInstall.csproj
@@ -11,7 +11,8 @@
     <RootNamespace>ServiceInstall</RootNamespace>
     <AssemblyName>ServiceInstall</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
@@ -78,6 +79,7 @@
     <Compile Include="ServiceHelper.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="app.manifest">
       <SubType>Designer</SubType>
     </None>
diff --git a/ServiceHelpers/ServiceInstall/app.config b/ServiceHelpers/ServiceInstall/app.config
new file mode 100644
index 000000000..e36560333
--- /dev/null
+++ b/ServiceHelpers/ServiceInstall/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj b/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj
index 8fed7f3ab..2921fec31 100644
--- a/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj
+++ b/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj
@@ -11,7 +11,8 @@
     <RootNamespace>ServiceUninstall</RootNamespace>
     <AssemblyName>ServiceUninstall</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
@@ -78,6 +79,7 @@
     <Compile Include="ServiceHelper.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="app.manifest">
       <SubType>Designer</SubType>
     </None>
diff --git a/ServiceHelpers/ServiceUninstall/app.config b/ServiceHelpers/ServiceUninstall/app.config
new file mode 100644
index 000000000..e36560333
--- /dev/null
+++ b/ServiceHelpers/ServiceUninstall/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/package.bat b/package.bat
index fc70a3ba8..15888f2e6 100644
--- a/package.bat
+++ b/package.bat
@@ -1,40 +1,24 @@
 SET PACKAGEROOT=_rawPackage
 SET TARGET=%PACKAGEROOT%\NzbDrone
+SET COPY_FLAGS=/S /V /I /Y
+SET DELETE_FLAGS=/Q /F /S
 
 rd %PACKAGEROOT% /S /Q
-del nzbdrone*.zip /Q /F
+del nzbdrone*.zip %DELETE_FLAGS%
+del _output\FluentValidation.resources.dll %DELETE_FLAGS%
 
 echo ##teamcity[progressMessage 'Packaging release']
 
-xcopy IISExpress %TARGET%\IISExpress /E /V /I /Y
-
-
-xcopy ServiceHelpers\ServiceInstall\bin\Release\*.exe  %TARGET%\ /E /V /I /Y
-xcopy ServiceHelpers\ServiceUninstall\bin\Release\*.exe  %TARGET%\ /E /V /I /Y
-
-xcopy NzbDrone\bin\Debug\*.*  %TARGET%\ /E /V /I /Y
-xcopy NzbDrone\bin\Release\*.*  %TARGET%\ /E /V /I /Y
-
-xcopy NzbDrone.Update\bin\Debug\*.*  %TARGET%\NzbDrone.Update\ /E /V /I /Y
-xcopy NzbDrone.Update\bin\Release\*.*  %TARGET%\NzbDrone.Update\ /E /V /I /Y
+xcopy ServiceHelpers\ServiceInstall\bin\Release\*.exe  %TARGET%\ %COPY_FLAGS%
+xcopy ServiceHelpers\ServiceUninstall\bin\Release\*.exe  %TARGET%\ %COPY_FLAGS%
 
+xcopy _output\*.*  %TARGET%\ %COPY_FLAGS%
+xcopy NzbDrone.Update\bin\Release\*.*  %TARGET%\NzbDrone.Update\ %COPY_FLAGS%
 
 CD %PACKAGEROOT%
 
-del nlog.xml /Q /F /S
-del nlog.pdb /Q /F /S
-del Twitterizer2.pdb /Q /F /S
-del *.vshost.exe.* /Q /F /S
-del ninject*.pdb /Q /F /S
-del ninject*.xml /Q /F /S
-del nlog.pdb /Q /F /S
-del Newtonsoft.Json.xml /Q /F /S
-del Newtonsoft.Json.pdb /Q /F /S
-del Mvc*.pdb /Q /F /S
-
-del *debug.js /Q /F /S
-del *-vsdoc.js /Q /F /S
-
+del *.xml %DELETE_FLAGS%
+del *.vshost.exe.* %DELETE_FLAGS%
 
 ..\Libraries\7zip\7za.exe a -tzip ..\NzbDrone.zip *