diff --git a/recipes/git/git.patch b/recipes/git/git.patch
index ef031f8ef8889ca6cdfaa4566273d92dab19b30c..b853970b153b00a0451da5d304108bc06056ed90 100644
--- a/recipes/git/git.patch
+++ b/recipes/git/git.patch
@@ -239,88 +239,6 @@ diff -ru git-2.13.1/config.c git-2.13.1-new/config.c
  		packed_git_window_size = git_config_ulong(var, value);
  
  		/* This value must be multiple of (pagesize * 2) */
-diff -ru git-2.13.1/configure.ac git-2.13.1-new/configure.ac
---- git-2.13.1/configure.ac	2017-06-04 18:08:11.000000000 -0700
-+++ git-2.13.1-new/configure.ac	2017-06-17 08:31:04.941134924 -0700
-@@ -732,10 +732,7 @@
- [NO_SYS_SELECT_H=UnfortunatelyYes])
- GIT_CONF_SUBST([NO_SYS_SELECT_H])
- #
--# Define NO_SYS_POLL_H if you don't have sys/poll.h
--AC_CHECK_HEADER([sys/poll.h],
--[NO_SYS_POLL_H=],
--[NO_SYS_POLL_H=UnfortunatelyYes])
-+NO_SYS_POLL_H=UnfortunatelyYes
- GIT_CONF_SUBST([NO_SYS_POLL_H])
- #
- # Define NO_INTTYPES_H if you don't have inttypes.h
-@@ -860,56 +857,13 @@
- #
- # Define FREAD_READS_DIRECTORIES if your are on a system which succeeds
- # when attempting to read from an fopen'ed directory.
--AC_CACHE_CHECK([whether system succeeds to read fopen'ed directory],
-- [ac_cv_fread_reads_directories],
--[
--AC_RUN_IFELSE(
--	[AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
--		[[char c;
--		FILE *f = fopen(".", "r");
--		return f && fread(&c, 1, 1, f)]])],
--	[ac_cv_fread_reads_directories=no],
--	[ac_cv_fread_reads_directories=yes])
--])
--if test $ac_cv_fread_reads_directories = yes; then
--	FREAD_READS_DIRECTORIES=UnfortunatelyYes
--else
--	FREAD_READS_DIRECTORIES=
--fi
-+FREAD_READS_DIRECTORIES=UnfortunatelyYes
- GIT_CONF_SUBST([FREAD_READS_DIRECTORIES])
- #
- # Define SNPRINTF_RETURNS_BOGUS if your are on a system which snprintf()
- # or vsnprintf() return -1 instead of number of characters which would
- # have been written to the final string if enough space had been available.
--AC_CACHE_CHECK([whether snprintf() and/or vsnprintf() return bogus value],
-- [ac_cv_snprintf_returns_bogus],
--[
--AC_RUN_IFELSE(
--	[AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
--		#include "stdarg.h"
--
--		int test_vsnprintf(char *str, size_t maxsize, const char *format, ...)
--		{
--		  int ret;
--		  va_list ap;
--		  va_start(ap, format);
--		  ret = vsnprintf(str, maxsize, format, ap);
--		  va_end(ap);
--		  return ret;
--		}],
--		[[char buf[6];
--		  if (test_vsnprintf(buf, 3, "%s", "12345") != 5
--		      || strcmp(buf, "12")) return 1;
--		  if (snprintf(buf, 3, "%s", "12345") != 5
--		      || strcmp(buf, "12")) return 1]])],
--	[ac_cv_snprintf_returns_bogus=no],
--	[ac_cv_snprintf_returns_bogus=yes])
--])
--if test $ac_cv_snprintf_returns_bogus = yes; then
- 	SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes
--else
--	SNPRINTF_RETURNS_BOGUS=
--fi
- GIT_CONF_SUBST([SNPRINTF_RETURNS_BOGUS])
- #
- # Define NEEDS_MODE_TRANSLATION if your OS strays from the typical file type
-@@ -1064,6 +1018,8 @@
- #
- #
- # Define NO_MMAP if you want to avoid mmap.
-+NO_MMAP=YES
-+GIT_CONF_SUBST([NO_MMAP])
- #
- # Define NO_ICONV if your libc does not properly support iconv.
- 
 diff -ru git-2.13.1/connect.c git-2.13.1-new/connect.c
 --- git-2.13.1/connect.c	2017-06-04 18:08:11.000000000 -0700
 +++ git-2.13.1-new/connect.c	2017-06-25 16:49:55.499598388 -0700
diff --git a/recipes/git/recipe.sh b/recipes/git/recipe.sh
index cf8b92f4f1043591a3071f7c12029ab328bbe920..71b17ffafece00cf9240e787a6c651b470020d14 100644
--- a/recipes/git/recipe.sh
+++ b/recipes/git/recipe.sh
@@ -16,6 +16,8 @@ export RANLIB="${HOST}-ranlib"
 export READELF="${HOST}-readelf"
 export STRIP="${HOST}-strip"
 
+MAKEFLAGS="NO_MMAP=1"
+
 function recipe_version {
     echo "$VERSION"
     skip=1
@@ -27,9 +29,8 @@ function recipe_update {
 }
 
 function recipe_build {
-    autoconf -f
-    ./configure --host=${HOST} --prefix=/ --with-zlib="${PWD}/../sysroot"
-    make
+    ./configure --host=${HOST} --prefix=/ --with-zlib="${PWD}/../sysroot" ac_cv_fread_reads_directories=yes ac_cv_snprintf_returns_bogus=yes
+    make ${MAKEFLAGS}
     skip=1
 }
 
@@ -45,7 +46,7 @@ function recipe_clean {
 
 function recipe_stage {
     dest="$(realpath $1)"
-    make DESTDIR="$dest" install
+    make DESTDIR="$dest" ${MAKEFLAGS} install
     ${STRIP} $1/bin/* || true
     ${STRIP} $1/libexec/git-core/* || true
     rm -rf $1/share/man