Index: scripts/config.bat
===================================================================
diff -u -N -r03340b954ead8138d669ee4f8df7124dc84c5612 -r07fcd16f9a6e678a95133127f207509d18045080
--- scripts/config.bat	(.../config.bat)	(revision 03340b954ead8138d669ee4f8df7124dc84c5612)
+++ scripts/config.bat	(.../config.bat)	(revision 07fcd16f9a6e678a95133127f207509d18045080)
@@ -10,14 +10,34 @@
 SET TmpDir=%CurrentDir%\tmp
 
 SET VSInstallDirX64=%ProgramFiles%\Microsoft Visual Studio 9.0
+SET ProgramFilesX86=%ProgramFiles%
 
 rem NOTE: Strange construct here because of strange behaviour of %ProgramFiles(x86)% which loses last parenthesis otherwise
 if "%ProgramFiles(x86)%" == "" SET VSInstallDirX86=%ProgramFiles%\Microsoft Visual Studio 9.0
 if NOT "%ProgramFiles(x86)%" == "" SET VSInstallDirX86=%ProgramFiles(x86)%\Microsoft Visual Studio 9.0
+if NOT "%ProgramFiles(x86)%" == "" SET ProgramFilesX86=%ProgramFiles(x86)%
 
 if not exist "%ScriptDir%\config.bat" (
 	echo ERROR: This script needs to be called from its directory.
 	exit /b 1
 )
 
+rem Detect 7-zip location
+SET SEVENZIPEXE=
+for %%X in (7z.exe) do (set SEVENZIPEXE=%%~$PATH:X)
+if "%SEVENZIPEXE%" == "" set SEVENZIPEXE=%ProgramFiles%\7-Zip\7z.exe
+if not exist "%SEVENZIPEXE%" (
+	echo 7-zip executable is not in the PATH nor at its default location. Please install 7-zip.
+	exit /b 1
+)
+
+rem Detect inno setup compiler
+SET ISCCEXE=
+for %%X in (iscc.exe) do (set ISCCEXE=%%~$PATH:X)
+if "%ISCCEXE%" == "" set ISCCEXE=%ProgramFilesX86%\Inno Setup 5\iscc.exe
+if not exist "%ISCCEXE%" (
+	echo Inno setup compiler executable is not in the PATH nor at its default location. Please install Inno Setup.
+	exit /b 1
+)
+
 exit /b 0
Index: scripts/make_existing_release.bat
===================================================================
diff -u -N -r409a0af1e9fdea72ca016118d76a5a95e53496e8 -r07fcd16f9a6e678a95133127f207509d18045080
--- scripts/make_existing_release.bat	(.../make_existing_release.bat)	(revision 409a0af1e9fdea72ca016118d76a5a95e53496e8)
+++ scripts/make_existing_release.bat	(.../make_existing_release.bat)	(revision 07fcd16f9a6e678a95133127f207509d18045080)
@@ -111,7 +111,7 @@
 
 cd %CHSrcDir%
 
-7z a "%OutputDir%\chsrc-%CHTextVersion%.zip" -tzip -x^^!"scripts\*.bat" -xr^^!".svn" . >"%TmpDir%\command.log"
+"%SEVENZIPEXE%" a "%OutputDir%\chsrc-%CHTextVersion%.zip" -tzip -x^^!"scripts\*.bat" -xr^^!".svn" . >"%TmpDir%\command.log"
 if errorlevel 1 (
 	echo ERROR: Preparation of the sources failed. See the log below:
 	type "%TmpDir%\command.log"
@@ -140,7 +140,7 @@
 
 cd %MainProjectDir%\bin\release
 
-7z a "%OutputDir%\ch_symbols-%CHTextVersion%.zip" -tzip "*.pdb"  >"%TmpDir%\command.log"
+"%SEVENZIPEXE%" a "%OutputDir%\ch_symbols-%CHTextVersion%.zip" -tzip "*.pdb"  >"%TmpDir%\command.log"
 if errorlevel 1 (
 	echo ERROR: Could not create symbols archive. See the log below:
 	type "%TmpDir%\command.log"
@@ -156,7 +156,7 @@
 
 cd %MainProjectDir%\scripts
 
-iscc setup.iss /o%OutputDir%  >"%TmpDir%\command.log"
+"%ISCCEXE%" setup.iss /o%OutputDir%  >"%TmpDir%\command.log"
 if errorlevel 1 (
 	echo ERROR: Preparation of the installer version failed. See the log below:
 	type "%TmpDir%\command.log"
@@ -214,7 +214,7 @@
 
 cd "%TmpDir%\"
 
-7z a -tzip "%OutputDir%\ch-%CHTextVersion%.zip" zip32 zip64 >"%TmpDir%\command.log"
+"%SEVENZIPEXE%" a -tzip "%OutputDir%\ch-%CHTextVersion%.zip" zip32 zip64 >"%TmpDir%\command.log"
 if errorlevel 1 (
 	echo ERROR: Could not create win32 zip archive. See the log below:
 	type "%TmpDir%\command.log"