diff --git a/Makefile.in b/Makefile.in
index 035726121e4..404d15030d1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -167,16 +167,16 @@ update-changes:
 	                    /^( *\*|Changes with Apache )/ && active == 1 && done == 0{rec=$$0; while((getline<fname) > 0){if (! ($$0 ~ /^ *$$/)){print}}printf "\n";print rec; active = 0; done = 1; next} //;' \
 	    CHANGES.tmp > CHANGES ; \
 	    rm CHANGES.tmp ; \
-	    if [ -n "$(SVN)" ] ; then \
-	        if ! $(SVN) rm "$$i" 2>/dev/null ; then \
+	    if [ -n "$(GIT)" ] ; then \
+	        if ! $(GIT) rm "$$i" 2>/dev/null ; then \
 	            $(RM) "$$i" ; \
 	        fi ; \
 	    else \
 	        $(RM) "$$i" ; \
 	    fi ; \
 	done ; \
-	if [ -n "$(SVN)" ] ; then \
-	    $(SVN) diff CHANGES ; \
+	if [ -n "$(GIT)" ] ; then \
+	    $(GIT) diff -- CHANGES ; \
 	fi
 
 validate-xml:
diff --git a/acinclude.m4 b/acinclude.m4
index 51cf130c9e7..7e71db0e25e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -79,7 +79,7 @@ AC_DEFUN([APACHE_GEN_CONFIG_VARS],[
   APACHE_SUBST(LIBTOOL)
   APACHE_SUBST(SHELL)
   APACHE_SUBST(RSYNC)
-  APACHE_SUBST(SVN)
+  APACHE_SUBST(GIT)
   APACHE_SUBST(MODULE_DIRS)
   APACHE_SUBST(MODULE_CLEANDIRS)
   APACHE_SUBST(PORT)
diff --git a/configure.in b/configure.in
index a4a9dba9c6b..7e47eb21dbe 100644
--- a/configure.in
+++ b/configure.in
@@ -395,7 +395,7 @@ dnl ## Check for programs
 AC_PATH_PROG(RM, rm)
 AC_PATH_PROG(PKGCONFIG, pkg-config)
 AC_PATH_PROG(RSYNC, rsync)
-AC_PATH_PROG(SVN, svn)
+AC_PATH_PROG(GIT, git)
 AC_PROG_AWK
 AC_PROG_LN_S
 AC_CHECK_TOOL(RANLIB, ranlib, true)