diff --git a/bootstrap/win/win_tools.bat b/bootstrap/win/win_tools.bat
index 9ecc84070..af7a15d73 100644
--- a/bootstrap/win/win_tools.bat
+++ b/bootstrap/win/win_tools.bat
@@ -26,6 +26,8 @@ if "%1" == "force" (
 
 
 :GIT_CHECK
+call ver | findstr "XP" 2>nul 1>nul
+if errorlevel 0 goto :GIT_XP_CHECK
 if "%DEPOT_TOOLS_GIT_1852%" == "0" goto :GIT_180_CHECK
 goto :GIT_1852_CHECK
 
@@ -38,6 +40,19 @@ set GIT_ZIP_URL=https://commondatastorage.googleapis.com/chrome-infra/%GIT_ZIP_F
 goto :GIT_COMMON
 
 
+:: Our new build of git doesn't work on XP (uses newer APIs).
+:GIT_XP_CHECK
+:: If the new git was installed, remove all old git packages and reinstall the
+:: correct version from scratch.
+if exist "%WIN_TOOLS_ROOT_DIR%\git-1.8.5.2.chromium.1_bin" (
+  rmdir /S /Q "%WIN_TOOLS_ROOT_DIR%\git-1.8.5.2.chromium.1_bin"
+  if exist "%WIN_TOOLS_ROOT_DIR%\git-1.8.0_bin" (
+    rmdir /S /Q "%WIN_TOOLS_ROOT_DIR%\git-1.8.0_bin"
+  )
+)
+goto :GIT_180_CHECK
+
+
 :GIT_180_CHECK
 set GIT_VERSION=1.8.0
 set GIT_BIN_DIR=git-%GIT_VERSION%_bin