diff --git a/contrib/windows-install/HOW_TO.txt b/contrib/windows-install/HOW_TO.txt
index b2cad56b..98fb51b8 100644
--- a/contrib/windows-install/HOW_TO.txt
+++ b/contrib/windows-install/HOW_TO.txt
@@ -2,7 +2,7 @@
 
 2. update settings.cmd
 
-3. Download http://www.f2ko.de/downloads/Bat_To_Exe_Converter.zip
+3. Download http://www.f2ko.de/downloads/Bat_To_Exe_Converter.zip extrat 32 and 64bit version and respectivly rename to Bat_To_Exe_Converter_x32.exe and Bat_To_Exe_Converter_x64.exe
 
 4. Download http://nebm.ist.utl.pt/~glopes/wget/wget-1.11.4-x64.zip, unzip and rename to => wget-x64.exe
 
diff --git a/contrib/windows-install/create-exe-setup-weboob.bat b/contrib/windows-install/create-exe-setup-weboob.bat
index 2b54592d..db062477 100644
--- a/contrib/windows-install/create-exe-setup-weboob.bat
+++ b/contrib/windows-install/create-exe-setup-weboob.bat
@@ -1,3 +1,3 @@
 @echo off
 call settings.cmd
-"Bat_To_Exe_Converter.exe" -bat "setup-weboob.bat" -save "setup-weboob-%WEBOOB_VERSION%-%ARCHITECTURE%.exe" -icon "ICON\weboobtxt.ico" -include "Bat_To_Exe_Converter.exe" -include "wget-%ARCHITECTURE%.exe" -include "weboob-%WEBOOB_VERSION%-py2.7.egg" -include "convertPNG2ICO.py" -include "ez_setup.py" -include "settings.cmd"
\ No newline at end of file
+"Bat_To_Exe_Converter_%ARCHITECTURE%.exe" -bat "setup-weboob.bat" -save "setup-weboob-%WEBOOB_VERSION%-%ARCHITECTURE%.exe" -icon "ICON\weboobtxt.ico" -include "Bat_To_Exe_Converter.exe" -include "wget-%ARCHITECTURE%.exe" -include "%WEBOOB%" -include "convertPNG2ICO.py" -include "ez_setup.py" -include "settings.cmd"
\ No newline at end of file
diff --git a/contrib/windows-install/setup-weboob.bat b/contrib/windows-install/setup-weboob.bat
index 333485ee..470f7284 100644
--- a/contrib/windows-install/setup-weboob.bat
+++ b/contrib/windows-install/setup-weboob.bat
@@ -15,8 +15,13 @@ set WGET=wget-%ARCHITECTURE%.exe
 
 echo.
 echo 2.Check Python 2.7 Installation
+
 set KEY_NAME=HKLM\Software\Python\PythonCore\2.7\InstallPath
-REG QUERY %KEY_NAME% > nul || 	(
+if %ARCHITECTURE% == x64 (
+	set KEY_NAME=HKLM\SOFTWARE\Wow6432Node\Python\PythonCore\2.7\InstallPath							
+)
+
+REG QUERY !KEY_NAME! > nul || 	(
 									set PYTHON_MSI=python-2.7.5.msi
 									if %ARCHITECTURE% == x64 (
 										set PYTHON_MSI=python-2.7.5.amd64.msi								
@@ -32,7 +37,7 @@ REG QUERY %KEY_NAME% > nul || 	(
 									del python_donwload
 								)
 								
-for /F "tokens=4" %%A IN ('REG QUERY %KEY_NAME%') do (
+for /F "tokens=4" %%A IN ('REG QUERY !KEY_NAME!') do (
     set PythonPath=%%A
 )
 
@@ -131,7 +136,7 @@ for %%i in (%LIST_APPLIQUATIONS_QT%) do (
 		del "%StartupFolder%\Weboob\%%i.exe"
 	)
 
-	"Bat_To_Exe_Converter.exe" -bat "%%i.bat" -save "%StartupFolder%\Weboob\%%i.exe" -icon "%PythonPath%\Lib\site-packages\%WEBOOB%\share\icons\hicolor\64x64\apps\%%i.ico" %%i"
+	"Bat_To_Exe_Converter_%ARCHITECTURE%.exe" -bat "%%i.bat" -save "%StartupFolder%\Weboob\%%i.exe" -icon "%PythonPath%\Lib\site-packages\%WEBOOB%\share\icons\hicolor\64x64\apps\%%i.ico" %%i"
 	del "%%i.bat"
 	del "%PythonPath%\Lib\site-packages\%WEBOOB%\share\icons\hicolor\64x64\apps\%%i.ico"
 )