diff --git a/.gitignore b/.gitignore
index 364f78d50..e0931490a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,3 +141,4 @@ output/*
 _start
 
 src/.idea/
+/distribution/windows/setup/output/*
diff --git a/distribution/windows/setup/build.bat b/distribution/windows/setup/build.bat
index dfeba4491..21d622359 100644
--- a/distribution/windows/setup/build.bat
+++ b/distribution/windows/setup/build.bat
@@ -1,5 +1,5 @@
-REM SET BUILD_NUMBER=1
-REM SET BRANCH=develop
+SET BUILD_NUMBER=1
+SET BRANCH=develop
 echo ##teamcity[progressStart 'Building setup file']
 inno\ISCC.exe sonarr.iss
 echo ##teamcity[progressFinish 'Building setup file']
diff --git a/distribution/windows/setup/sonarr.iss b/distribution/windows/setup/sonarr.iss
index 850fc0820..dd3ed35d7 100644
--- a/distribution/windows/setup/sonarr.iss
+++ b/distribution/windows/setup/sonarr.iss
@@ -37,6 +37,7 @@ Compression=lzma2/normal
 AppContact={#ForumsURL}
 VersionInfoVersion={#BuildNumber}
 SetupLogging=yes
+OutputDir=output
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -59,6 +60,7 @@ Name: "{userstartup}\{#AppName}"; Filename: "{app}\Sonarr.exe"; WorkingDir: "{ap
 
 [InstallDelete]
 Name: "{commonappdata}\NzbDrone\bin"; Type: filesandordirs
+Name: "{app}"; Type: filesandordirs
 
 [Run]
 Filename: "{app}\Sonarr.Console.exe"; StatusMsg: "Removing previous Windows Service"; Parameters: "/u"; Flags: runhidden waituntilterminated;