diff --git a/win32/setup.mak b/win32/setup.mak
index 61c570fff9..91f8123868 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -64,6 +64,7 @@ USE_RUBYGEMS = $(USE_RUBYGEMS)
 ENABLE_DEBUG_ENV = $(ENABLE_DEBUG_ENV)
 !endif
 
+# TOOLS
 <<
 !if !defined(BASERUBY)
 	@for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I>> $(MAKEFILE)
@@ -78,6 +79,12 @@ ENABLE_DEBUG_ENV = $(ENABLE_DEBUG_ENV)
 !else
 	@echo HAVE_BASERUBY = no>> $(MAKEFILE)
 !endif
+!if "$(GIT)" != ""
+	@echo GIT = $(GIT)>> $(MAKEFILE)
+!endif
+!if "$(HAVE_GIT)" != ""
+	@echo HAVE_GIT = $(HAVE_GIT)>> $(MAKEFILE)
+!endif
 
 -osname-section-:
 	@$(APPEND)