Index: scripts/setup.iss
===================================================================
diff -u -rc77c50cef1b11f89bd75ede1e98ca68f8a8387c6 -r6aeba0adc6c1b1bd2dcd6dea2ad2306426210ead
--- scripts/setup.iss	(.../setup.iss)	(revision c77c50cef1b11f89bd75ede1e98ca68f8a8387c6)
+++ scripts/setup.iss	(.../setup.iss)	(revision 6aeba0adc6c1b1bd2dcd6dea2ad2306426210ead)
@@ -12,20 +12,22 @@
 #endif
 
 #if X86_64
+	#define InstallerFilename "chsetup64_" + PRODUCT_VERSION
+
 	#define ExeFilename "ch64.exe"
 	#define ShellExtFilename "chext64.dll"
 	#define LibicpfFilename "libicpf64u.dll"
 	#define LibictranslateFilename "libictranslate64u.dll"
 	#define ICTranslateFilename "ictranslate64.exe"
-	#define InstallerFilename "chsetup64"
 	#define MSRedistDir "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\amd64"
 #else
+	#define InstallerFilename "chsetup32_" + PRODUCT_VERSION
+
 	#define ExeFilename "ch.exe"
 	#define ShellExtFilename "chext.dll"
 	#define LibicpfFilename "libicpf32u.dll"
 	#define LibictranslateFilename "libictranslate32u.dll"
 	#define ICTranslateFilename "ictranslate.exe"
-	#define InstallerFilename "chsetup32"
 	#define MSRedistDir "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86"
 #endif
 
@@ -44,11 +46,19 @@
 LicenseFile=..\License.txt
 OutputDir=..\bin
 OutputBaseFilename={#InstallerFilename}
-Compression=lzma
+Compression=lzma/ultra
 SolidCompression=true
 AppMutex=_Copy handler_ instance
 ShowLanguageDialog=auto
 AppID={{9CF6A157-F0E8-4216-B229-C0CA8204BE2C}
+InternalCompressLevel=ultra
+AppCopyright={#COPYRIGHT_INFO}
+AppVersion={#PRODUCT_VERSION}
+UninstallDisplayIcon={app}\{#ExeFilename}
+AppContact=ixen(at)copyhandler(dot)com
+VersionInfoVersion=
+VersionInfoTextVersion={#PRODUCT_VERSION}
+VersionInfoCopyright={#COPYRIGHT_INFO}
 
 [Languages]
 Name: english; MessagesFile: compiler:Default.isl
@@ -83,7 +93,6 @@
 Source: ..\bin\release\{#LibicpfFilename}; DestDir: {app}; Flags: ignoreversion
 Source: ..\bin\release\{#LibictranslateFilename}; DestDir: {app}; Flags: ignoreversion
 Source: ..\bin\release\{#ICTranslateFilename}; DestDir: {app}; Flags: ignoreversion
-Source: ..\bin\release\ch.ini.template; DestDir: {app}; Flags: ignoreversion
 Source: ..\bin\release\help\*; DestDir: {app}\help; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: ..\bin\release\langs\*; DestDir: {app}\langs; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: {#MSRedistDir}\Microsoft.VC90.CRT\*; DestDir: {app}; Flags: ignoreversion
@@ -99,15 +108,12 @@
 Filename: {app}\{#MyAppExeName}; Description: {cm:LaunchProgram,{#MyAppName}}; Flags: nowait postinstall skipifsilent
 
 [Registry]
-Root: HKCU; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\Run; ValueType: string; ValueName: Copy Handler; Flags: dontcreatekey uninsdeletevalue
+Root: HKLM; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\Run; ValueType: string; ValueName: Copy Handler; Flags: dontcreatekey deletevalue
 Root: HKCU; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\Run; ValueType: string; ValueName: Copy Handler; Tasks: " startatboot"; ValueData: {app}\{#ExeFilename}; Flags: uninsdeletevalue
 
-[INI]
-Filename: {app}\ch.ini; Section: Program; Key: Reload after restart; String: 1; Tasks: startatboot
-
 [Dirs]
-Name: {app}\help
-Name: {app}\langs
+Name: {app}\help; Flags: uninsalwaysuninstall
+Name: {app}\langs; Flags: uninsalwaysuninstall
 
 [_ISTool]
 UseAbsolutePaths=false
Index: src/ch/AppHelper.cpp
===================================================================
diff -u -r7c612814a43eb389fa1ac27ccd8f621fd4ff37e8 -r6aeba0adc6c1b1bd2dcd6dea2ad2306426210ead
--- src/ch/AppHelper.cpp	(.../AppHelper.cpp)	(revision 7c612814a43eb389fa1ac27ccd8f621fd4ff37e8)
+++ src/ch/AppHelper.cpp	(.../AppHelper.cpp)	(revision 6aeba0adc6c1b1bd2dcd6dea2ad2306426210ead)
@@ -214,7 +214,7 @@
 {
 	// storing key in registry
 	HKEY hkeyRun;
-	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run"), 0, KEY_ALL_ACCESS, &hkeyRun) != ERROR_SUCCESS)
+	if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run"), 0, KEY_ALL_ACCESS, &hkeyRun) != ERROR_SUCCESS)
 		return;
 	
 	if (bState)
Index: src/common/version.h
===================================================================
diff -u -rf0604f6f958d536b05df294dc43aff93a249bf2c -r6aeba0adc6c1b1bd2dcd6dea2ad2306426210ead
--- src/common/version.h	(.../version.h)	(revision f0604f6f958d536b05df294dc43aff93a249bf2c)
+++ src/common/version.h	(.../version.h)	(revision 6aeba0adc6c1b1bd2dcd6dea2ad2306426210ead)
@@ -9,10 +9,10 @@
 // Version of program
 #define PRODUCT_VERSION1 1
 #define PRODUCT_VERSION2 30
-#define PRODUCT_VERSION3 112
+#define PRODUCT_VERSION3 113
 #define PRODUCT_VERSION4 0
 
-#define PRODUCT_VERSION "1.30beta-svn112"
+#define PRODUCT_VERSION "1.30beta-svn113"
 
 // Full product information (concatenation of the three above informations)
 #if SETUP_COMPILER != 1