diff --git a/make/winx86/README.txt b/make/winx86/README.txt
index fb383fa17..24f160f34 100644
--- a/make/winx86/README.txt
+++ b/make/winx86/README.txt
@@ -33,8 +33,8 @@ It is expected that you have the following tools installed into the listed
 locations (but any other locations are fine as well):
 
  - Python            in C:\Python27
- - CodeSourcery G++  in C:\CodeSourcery
  - QtSDK             in C:\Qt\2010.05
+ - CodeSourcery G++  in %ProgramFiles%\CodeSourcery\Sourcery G++ Lite
  - msysGit           in %ProgramFiles%\Git
  - Unicode NSIS      in %ProgramFiles%\NSIS\Unicode
  - OpenOCD           in C:\OpenOCD\0.4.0\bin
@@ -55,6 +55,10 @@ accordingly. Also if you have tools installed into different directories and
 they are not in the PATH, then you may want to update paths in the sh.cmd
 script too (it is self-documented).
 
+Note for Windows 64-bit users: 64-bit systems use %ProgramFiles(x86)% folder
+as default for program files instead of %ProgramFiles%. You have to check where
+your tools are installed and update paths above accordingly.
+
 
 3. How to use it?
 -----------------
diff --git a/make/winx86/cmd/sh.cmd b/make/winx86/cmd/sh.cmd
index d82c7ec99..dd70a8e44 100644
--- a/make/winx86/cmd/sh.cmd
+++ b/make/winx86/cmd/sh.cmd
@@ -53,7 +53,7 @@ set PATH_DIRS=
 call :which MSYSGIT       "%ProgramFiles%\Git\bin"       git.exe
 call :which QTMINGW       "C:\Qt\2010.05\mingw\bin"      mingw32-make.exe
 call :which QTSDK         "C:\Qt\2010.05\qt\bin"         qmake.exe
-call :which CODESOURCERY  "C:\CodeSourcery\bin"          cs-make.exe
+call :which CODESOURCERY  "%ProgramFiles%\CodeSourcery\Sourcery G++ Lite\bin" cs-make.exe
 call :which PYTHON        "C:\Python27"                  python.exe
 call :which UNSIS         "%ProgramFiles%\NSIS\Unicode"  makensis.exe
 call :which OPENOCDBIN    "C:\OpenOCD\0.4.0\bin"         openocd.exe