diff --git a/README.md b/README.md
index 81ecad7..8146437 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ The main advantage of Cmder is portability. It is designed to be totally self-co
 
 ## Integration
 
-So you've experimented with cmder a little and want to give it a shot in a more permanent home;
+So you've experimented with Cmder a little and want to give it a shot in a more permanent home;
 
 ### Shortcut to open Cmder in a chosen folder
 
diff --git a/config/ConEmu.xml b/config/ConEmu.xml
index 5786fba..1277d86 100644
--- a/config/ConEmu.xml
+++ b/config/ConEmu.xml
@@ -516,8 +516,8 @@
 					<value name="Name" type="string" data="{git sh}"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\cmder.exe&quot;"/>
-					<value name="Cmd1" type="string" data="cmd /k &quot;%ConEmuDir%\..\init.bat &amp; %CMDER_ROOT%\vendor\msysgit\bin\bash --login -i&quot; -new_console:d:%USERPROFILE%"/>
-					<value name="Cmd2" type="string" data="%CMDER_ROOT%\vendor\msysgit\git-bash.bat"/>
+					<value name="Cmd1" type="string" data="cmd /k &quot;%ConEmuDir%\..\init.bat &amp; %CMDER_ROOT%\vendor\git-for-windows\bin\bash --login -i&quot; -new_console:d:%USERPROFILE%"/>
+					<value name="Cmd2" type="string" data="%CMDER_ROOT%\vendor\git-for-windows\git-bash.exe"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
 				</key>
diff --git a/scripts/pack.ps1 b/scripts/pack.ps1
index 178d3a8..f047d82 100644
--- a/scripts/pack.ps1
+++ b/scripts/pack.ps1
@@ -42,7 +42,7 @@ Ensure-Executable "7z"
 $targets = @{
     "cmder.zip" = $null;
     "cmder.7z" = $null;
-    "cmder_mini.zip" = "-x!`"vendor\msysgit`"";
+    "cmder_mini.zip" = "-x!`"vendor\git-for-windows`"";
 }
 
 Delete-Existing "..\Version*"
diff --git a/vendor/init.bat b/vendor/init.bat
index 7a7f02c..769a654 100644
--- a/vendor/init.bat
+++ b/vendor/init.bat
@@ -21,7 +21,7 @@
 :: Run clink
 @"%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config"
 
-:: Prepare for msysgit
+:: Prepare for git-for-windows
 
 :: I do not even know, copypasted from their .bat
 @set PLINK_PROTOCOL=ssh
@@ -33,7 +33,7 @@
 ) else if exist "%ProgramFiles(x86)%\Git" (
     set "GIT_INSTALL_ROOT=%ProgramFiles(x86)%\Git"
 ) else if exist "%CMDER_ROOT%\vendor" (
-    set "GIT_INSTALL_ROOT=%CMDER_ROOT%\vendor\msysgit"
+    set "GIT_INSTALL_ROOT=%CMDER_ROOT%\vendor\git-for-windows"
 )
 
 :: Add git to the path
diff --git a/vendor/profile.ps1 b/vendor/profile.ps1
index dad67b7..c460e47 100644
--- a/vendor/profile.ps1
+++ b/vendor/profile.ps1
@@ -14,7 +14,7 @@ try {
     # Check if git is on PATH, i.e. Git already installed on system
     Get-command -Name "git" -ErrorAction Stop >$null
 } catch {
-    $env:Path += ";$env:CMDER_ROOT\vendor\msysgit\bin"
+    $env:Path += ";$env:CMDER_ROOT\vendor\git-for-windows\bin"
 }
 
 try {
diff --git a/vendor/sources.json b/vendor/sources.json
index d15c225..6eca667 100644
--- a/vendor/sources.json
+++ b/vendor/sources.json
@@ -1,8 +1,8 @@
 [
     {
-        "name": "msysgit",
-        "version": "1.9.5-preview20150319",
-        "url": "https://github.com/msysgit/msysgit/releases/download/Git-1.9.5-preview20150319/PortableGit-1.9.5-preview20150319.7z"
+        "name": "git-for-windows",
+        "version": "v2.5.0.windows.1",
+        "url": "https://github.com/git-for-windows/git/releases/download/v2.5.0.windows.1/PortableGit-2.5.0-32-bit.7z.exe"
     },
     {
         "name": "clink",