diff --git a/build.sh b/build.sh
index be16a7df3..237ec16d5 100755
--- a/build.sh
+++ b/build.sh
@@ -7,9 +7,9 @@ outputFolderOsxApp='./_output_osx_app'
 testPackageFolder='./_tests/'
 testSearchPattern='*.Test/bin/x86/Release'
 sourceFolder='./src'
-slnFile=$sourceFolder/NzbDrone.sln
-updateFolder=$outputFolder/NzbDrone.Update
-updateFolderMono=$outputFolderMono/NzbDrone.Update
+slnFile=$sourceFolder/Lidarr.sln
+updateFolder=$outputFolder/Lidarr.Update
+updateFolderMono=$outputFolderMono/Lidarr.Update
 
 nuget='tools/nuget/nuget.exe';
 CheckExitCode()
diff --git a/setup/build.bat b/setup/build.bat
index 1821e5844..964fe8abf 100644
--- a/setup/build.bat
+++ b/setup/build.bat
@@ -1,3 +1,3 @@
-#SET BUILD_NUMBER=1
-#SET branch=develop
+REM SET BUILD_NUMBER=1
+REM SET branch=develop
 inno\ISCC.exe nzbdrone.iss
\ No newline at end of file
diff --git a/setup/nzbdrone.iss b/setup/nzbdrone.iss
index 011781078..7a93a2fe3 100644
--- a/setup/nzbdrone.iss
+++ b/setup/nzbdrone.iss
@@ -14,7 +14,7 @@
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{56C1065D-3523-4025-B76D-6F73F67F7F71}
+AppId={{56C1065D-3523-4025-B76D-6F73F67F7F93}
 AppName={#AppName}
 AppVersion=2.0
 AppPublisher={#AppPublisher}
@@ -25,7 +25,7 @@ DefaultDirName={commonappdata}\Lidarr\bin
 DisableDirPage=yes
 DefaultGroupName={#AppName}
 DisableProgramGroupPage=yes
-OutputBaseFilename=Lidarr.{#BranchName}.{#BuildNumber}
+OutputBaseFilename=Lidarr.{#BranchName}.{#BuildNumber}.windows
 SolidCompression=yes
 AppCopyright=Creative Commons 3.0 License
 AllowUNCPath=False
@@ -40,8 +40,10 @@ VersionInfoVersion={#BuildNumber}
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Tasks]
-;Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "windowsService"; Description: "Install as a Windows Service"
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"
+Name: "windowsService"; Description: "Install Windows Service (Starts when the computer starts)"; GroupDescription: "Start automatically"; Flags: exclusive
+Name: "startupShortcut"; Description: "Create shortcut in Startup folder (Starts when you log into Windows)"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
+Name: "none"; Description: "Do not start automatically"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
 
 [Files]
 Source: "..\_output\Lidarr.exe"; DestDir: "{app}"; Flags: ignoreversion  
@@ -51,10 +53,13 @@ Source: "..\_output\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs cr
 [Icons]
 Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"
 Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"
+Name: "{userstartup}\{#AppName}"; Filename: "{app}\Lidarr.exe"; WorkingDir: "{app}"; Tasks: startupShortcut
 
 [Run]
-Filename: "{app}\lidarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated;
-Filename: "{app}\lidarr.console.exe"; Parameters: "/i"; Flags: waituntilterminated; Tasks: windowsService
+Filename: "{app}\Lidarr.Console.exe"; Parameters: "/u"; Flags: runhidden waituntilterminated;
+Filename: "{app}\Lidarr.Console.exe"; Parameters: "/i"; Flags: runhidden waituntilterminated; Tasks: windowsService
+Filename: "{app}\Lidarr.exe"; Description: "Open Lidarr"; Flags: postinstall skipifsilent nowait; Tasks: windowsService;
+Filename: "{app}\Lidarr.exe"; Description: "Start Lidarr"; Flags: postinstall skipifsilent nowait; Tasks: startupShortcut none;
 
 [UninstallRun]
 Filename: "{app}\lidarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist