diff --git a/Greenshot/releases/build.bat b/Greenshot/releases/build.bat
index eefdb6d02..0a6a6369f 100644
--- a/Greenshot/releases/build.bat
+++ b/Greenshot/releases/build.bat
@@ -6,6 +6,22 @@ echo An error occured, please check the build log!
 pause
 exit -1
 )
-echo Installer preparation start after key press
+echo File preparations
+cd ..
+echo Getting current Version
+tools\TortoiseSVN\SubWCRev.exe ..\ releases\additional_files\readme.template.txt releases\additional_files\readme.txt
+tools\TortoiseSVN\SubWCRev.exe ..\ releases\innosetup\setup.iss releases\innosetup\setup-SVN.iss
+tools\TortoiseSVN\SubWCRev.exe ..\ releases\package.bat releases\package-SVN.bat
+cd bin\Release
+del *.log
+echo Making MD5
+..\..\tools\FileVerifier++\fvc.exe -c -a MD5 -r -o checksum.MD5 Greenshot.exe GreenshotPlugin.dll
+cd ..\..\releases
+echo Building installer after key press
 pause
-package.bat
\ No newline at end of file
+call build_installer.bat
+echo Building zip after key press
+pause
+call package-SVN.bat
+echo Finshed
+pause
\ No newline at end of file
diff --git a/Greenshot/releases/build_installer.bat b/Greenshot/releases/build_installer.bat
new file mode 100644
index 000000000..a02074b17
--- /dev/null
+++ b/Greenshot/releases/build_installer.bat
@@ -0,0 +1,4 @@
+@echo off
+cd ..
+tools\innosetup\ISCC.exe releases\innosetup\setup-SVN.iss
+cd releases
\ No newline at end of file
diff --git a/Greenshot/releases/innosetup/setup.iss b/Greenshot/releases/innosetup/setup.iss
index af9ceb27c..42dd73d9a 100644
--- a/Greenshot/releases/innosetup/setup.iss
+++ b/Greenshot/releases/innosetup/setup.iss
@@ -118,7 +118,7 @@ InfoBeforeFile=..\additional_files\readme.txt
 LicenseFile=..\additional_files\license.txt
 LanguageDetectionMethod=uilanguage
 MinVersion=,5.01.2600
-OutputBaseFilename={#ExeName}-INSTALLER-{#Version}
+OutputBaseFilename={#ExeName}-INSTALLER-{#Version}-UNSTABLE
 OutputDir=..\
 PrivilegesRequired=none
 SetupIconFile=..\..\icons\applicationIcon\icon.ico
diff --git a/Greenshot/releases/package.bat b/Greenshot/releases/package.bat
index f4ef367b3..370206c76 100644
--- a/Greenshot/releases/package.bat
+++ b/Greenshot/releases/package.bat
@@ -1,20 +1,5 @@
 @echo off
 cd ..
-echo Getting current Version
-tools\TortoiseSVN\SubWCRev.exe ..\ releases\additional_files\readme.template.txt releases\additional_files\readme.txt
-tools\TortoiseSVN\SubWCRev.exe ..\ releases\innosetup\setup.iss releases\innosetup\setup-SVN.iss
-cd bin\Release
-del *.log
-echo Making MD5
-..\..\tools\FileVerifier++\fvc.exe -c -a MD5 -r -o checksum.MD5 Greenshot.exe GreenshotPlugin.dll
-cd ..\..
-echo Building installer after key press
-pause
-
-tools\innosetup\ISCC.exe releases\innosetup\setup-SVN.iss
-echo Building ZIP after key press
-pause
-
 del releases\Greenshot-NO-INSTALLER.zip
 mkdir releases\NO-INSTALLER
 echo ;dummy config, used to make greenshot store the configuration in this directory  > releases\NO-INSTALLER\greenshot.ini
@@ -38,11 +23,6 @@ del /s *.bak
 del /s *installer*.xml
 del /s *website*.xml
 del /s *template.txt
-..\..\tools\7zip\7za.exe a -x!.SVN -r ..\Greenshot-NO-INSTALLER.zip *
-cd ..\..
-echo Cleanup after key press
-pause
-
-rmdir /s /q releases\NO-INSTALLER
-echo Finshed
-pause
\ No newline at end of file
+..\..\tools\7zip\7za.exe a -x!.SVN -r ..\Greenshot-NO-INSTALLER-1.1.0.$WCREV$-UNSTABLE.zip *
+cd ..
+rmdir /s /q NO-INSTALLER