diff --git a/compat/win32/git-wrapper.c b/compat/win32/git-wrapper.c
index d4cfb563bb..39045764a9 100644
--- a/compat/win32/git-wrapper.c
+++ b/compat/win32/git-wrapper.c
@@ -96,7 +96,8 @@ static void setup_environment(LPWSTR exepath)
  * trim off the first argument and replace it leaving the rest
  * untouched.
  */
-static LPWSTR fixup_commandline(LPWSTR exepath, LPWSTR *exep, int *wait)
+static LPWSTR fixup_commandline(LPWSTR exepath, LPWSTR *exep, int *wait,
+	LPWSTR prefix_args, int prefix_args_len)
 {
 	int wargc = 0, gui = 0;
 	LPWSTR cmd = NULL, cmdline = NULL;
@@ -105,7 +106,7 @@ static LPWSTR fixup_commandline(LPWSTR exepath, LPWSTR *exep, int *wait)
 	cmdline = GetCommandLine();
 	wargv = CommandLineToArgvW(cmdline, &wargc);
 	cmd = (LPWSTR)malloc(sizeof(WCHAR) *
-		(wcslen(cmdline) + MAX_PATH));
+		(wcslen(cmdline) + prefix_args_len + 1 + MAX_PATH));
 	if (wargc > 1 && wcsicmp(L"gui", wargv[1]) == 0) {
 		*wait = 0;
 		if (wargc > 2 && wcsicmp(L"citool", wargv[2]) == 0) {
@@ -126,6 +127,9 @@ static LPWSTR fixup_commandline(LPWSTR exepath, LPWSTR *exep, int *wait)
 			*exep = NULL;
 		}
 	}
+	else if (prefix_args)
+		_swprintf(cmd, L"%s\\%s %.*s",
+			exepath, L"git.exe", prefix_args_len, prefix_args);
 	else
 		wcscpy(cmd, L"git.exe");
 
@@ -147,17 +151,45 @@ static LPWSTR fixup_commandline(LPWSTR exepath, LPWSTR *exep, int *wait)
 
 int main(void)
 {
-	int r = 1, wait = 1;
+	int r = 1, wait = 1, prefix_args_len = -1;
 	WCHAR exepath[MAX_PATH], exe[MAX_PATH];
-	LPWSTR cmd = NULL, exep = exe, basename;
+	LPWSTR cmd = NULL, exep = exe, prefix_args = NULL, basename;
 	UINT codepage = 0;
 
 	/* get the installation location */
 	GetModuleFileName(NULL, exepath, MAX_PATH);
-	PathRemoveFileSpec(exepath);
-	PathRemoveFileSpec(exepath);
-	setup_environment(exepath);
-	cmd = fixup_commandline(exepath, &exep, &wait);
+	if (!PathRemoveFileSpec(exepath)) {
+		fwprintf(stderr, L"Invalid executable path: %s\n", exepath);
+		ExitProcess(1);
+	}
+	basename = exepath + wcslen(exepath) + 1;
+	if (!wcsncmp(basename, L"git-", 4)) {
+		/* Call a builtin */
+		prefix_args = basename + 4;
+		prefix_args_len = wcslen(prefix_args);
+		if (!wcscmp(prefix_args + prefix_args_len - 4, L".exe"))
+			prefix_args_len -= 4;
+
+		/* set the default exe module */
+		wcscpy(exe, exepath);
+		PathAppend(exe, L"git.exe");
+	}
+	else if (!wcscmp(basename, L"git.exe")) {
+		if (!PathRemoveFileSpec(exepath)) {
+			fwprintf(stderr,
+				L"Invalid executable path: %s\n", exepath);
+			ExitProcess(1);
+		}
+
+		/* set the default exe module */
+		wcscpy(exe, exepath);
+		PathAppend(exe, L"bin\\git.exe");
+	}
+
+	if (!prefix_args)
+		setup_environment(exepath);
+	cmd = fixup_commandline(exepath, &exep, &wait,
+		prefix_args, prefix_args_len);
 
 	/* set the console to ANSI/GUI codepage */
 	codepage = GetConsoleCP();