diff --git a/bootstrap/win/python.new b/bootstrap/win/python.new
new file mode 100755
index 000000000..c60508fc4
--- /dev/null
+++ b/bootstrap/win/python.new
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+base_dir=$(dirname "$0")
+
+exec "$base_dir/python.bat" "$@"
diff --git a/bootstrap/win/python.new.bat b/bootstrap/win/python.new.bat
index 9dbe3853b..7c6ca878d 100644
--- a/bootstrap/win/python.new.bat
+++ b/bootstrap/win/python.new.bat
@@ -1,4 +1,4 @@
 @echo off
 setlocal
-set PATH=%~dp0python;%PATH%
-"%~dp0python\python.exe" %*
+set PATH=%~dp0python_bin;%PATH%
+"%~dp0python_bin\python.exe" %*
diff --git a/bootstrap/win/svn.new b/bootstrap/win/svn.new
new file mode 100755
index 000000000..c5370f211
--- /dev/null
+++ b/bootstrap/win/svn.new
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+base_dir=$(dirname "$0")
+
+exec "$base_dir/svn.bat" "$@"
diff --git a/bootstrap/win/svn.new.bat b/bootstrap/win/svn.new.bat
index 27a4495b3..63b472155 100644
--- a/bootstrap/win/svn.new.bat
+++ b/bootstrap/win/svn.new.bat
@@ -1,4 +1,4 @@
 @echo off
 setlocal
-set PATH=%~dp0svn;%PATH%
-"%~dp0svn\svn.exe" %*
+set PATH=%~dp0svn_bin;%PATH%
+"%~dp0svn_bin\svn.exe" %*
diff --git a/bootstrap/win/win_tools.bat b/bootstrap/win/win_tools.bat
index cacb51fb1..f1bbc54b7 100644
--- a/bootstrap/win/win_tools.bat
+++ b/bootstrap/win/win_tools.bat
@@ -34,16 +34,19 @@ goto :PYTHON_CHECK
 echo Installing subversion ...
 :: svn is not accessible; check it out and create 'proxy' files.
 if exist "%~dp0svn.7z" del "%~dp0svn.7z"
-cscript //nologo //e:jscript "%~dp0get_file.js" %WIN_TOOLS_ROOT_URL%/third_party/svn_win_client.zip "%~dp0svn.zip"
+cscript //nologo //e:jscript "%~dp0get_file.js" %WIN_TOOLS_ROOT_URL%/third_party/svn_bin.zip "%~dp0svn.zip"
 if errorlevel 1 goto :SVN_FAIL
 :: Cleanup svn directory if it was existing.
 if exist "%WIN_TOOLS_ROOT_DIR%\svn\." rd /q /s "%WIN_TOOLS_ROOT_DIR%\svn"
+if exist "%WIN_TOOLS_ROOT_DIR%\svn_bin\." rd /q /s "%WIN_TOOLS_ROOT_DIR%\svn_bin"
+:: Will create svn_bin\...
 cscript //nologo //e:jscript "%~dp0unzip.js" "%~dp0svn.zip" "%WIN_TOOLS_ROOT_DIR%"
 if errorlevel 1 goto :SVN_FAIL
-if not exist "%WIN_TOOLS_ROOT_DIR%\svn\." goto :SVN_FAIL
+if not exist "%WIN_TOOLS_ROOT_DIR%\svn_bin\." goto :SVN_FAIL
 del "%~dp0svn.zip"
 :: Create the batch file.
 call copy /y "%~dp0svn.new.bat" "%WIN_TOOLS_ROOT_DIR%\svn.bat" 1>nul
+call copy /y "%~dp0svn.new" "%WIN_TOOLS_ROOT_DIR%\svn" 1>nul
 goto :PYTHON_CHECK
 
 
@@ -73,10 +76,12 @@ goto :END
 echo Installing python ...
 :: Cleanup python directory if it was existing.
 if exist "%WIN_TOOLS_ROOT_DIR%\python\." rd /q /s "%WIN_TOOLS_ROOT_DIR%\python"
-call svn co -q %WIN_TOOLS_ROOT_URL%/third_party/python "%WIN_TOOLS_ROOT_DIR%\python"
+if exist "%WIN_TOOLS_ROOT_DIR%\python_bin\." rd /q /s "%WIN_TOOLS_ROOT_DIR%\python_bin"
+call svn co -q %WIN_TOOLS_ROOT_URL%/third_party/python "%WIN_TOOLS_ROOT_DIR%\python_bin"
 if errorlevel 1 goto :PYTHON_FAIL
 :: Create the batch file.
 call copy /y "%~dp0python.new.bat" "%WIN_TOOLS_ROOT_DIR%\python.bat" 1>nul
+call copy /y "%~dp0python.new" "%WIN_TOOLS_ROOT_DIR%\python" 1>nul
 set ERRORLEVEL=0
 goto :END