diff --git a/mingw-w64-git-git/PKGBUILD b/mingw-w64-git-git/PKGBUILD
index c472599f48..651ebc6324 100644
--- a/mingw-w64-git-git/PKGBUILD
+++ b/mingw-w64-git-git/PKGBUILD
@@ -16,13 +16,9 @@ depends=("${MINGW_PACKAGE_PREFIX}-libiconv")
 options=(!libtool strip staticlibs)
 
 source=("${_realname}"::"git+http://github.com/msysgit/git.git"
-        "config.patch"
-        "mingw64.patch"
-        "compat.patch")
+        "mingw64.patch")
 
 md5sums=('SKIP'
-         'SKIP'
-         'SKIP'
          'SKIP')
 
 pkgver() {
@@ -33,9 +29,7 @@ pkgver() {
 prepare() {
   export PYTHON_PATH='/usr/bin/python2'
   cd "$srcdir/$_realname"
-  patch -p1 -i $srcdir/config.patch
   patch -p1 -i $srcdir/mingw64.patch
-  patch -p1 -i $srcdir/compat.patch
   autoreconf -fi
 }
 
diff --git a/mingw-w64-git-git/compat.patch b/mingw-w64-git-git/compat.patch
deleted file mode 100644
index c09445cf7d..0000000000
--- a/mingw-w64-git-git/compat.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- git/compat/mingw.h	2014-07-21 16:25:57.184532700 +0100
-+++ git/compat/mingw.h	2014-07-21 16:27:35.440066300 +0100
-@@ -8,7 +8,6 @@
- typedef int pid_t;
- typedef int uid_t;
- typedef int socklen_t;
--#define hstrerror strerror
- 
- #define S_IFLNK    0120000 /* Symbolic link */
- #define S_ISLNK(x) (((x) & S_IFMT) == S_IFLNK)
diff --git a/mingw-w64-git-git/config.patch b/mingw-w64-git-git/config.patch
deleted file mode 100644
index b83418ffe6..0000000000
--- a/mingw-w64-git-git/config.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.ac	2014-06-02 10:26:25.000000000 +0100
-+++ b/configure.ac	2014-07-12 04:55:51.205001700 +0100
-@@ -742,12 +742,12 @@
- ## Checks for typedefs, structures, and compiler characteristics.
- AC_MSG_NOTICE([CHECKS for typedefs, structures, and compiler characteristics])
- #
--TYPE_SOCKLEN_T
--case $ac_cv_type_socklen_t in
--  yes)	SOCKLEN_T='';;
--  *)  	SOCKLEN_T=$git_cv_socklen_t_equiv;;
--esac
--GIT_CONF_SUBST([SOCKLEN_T])
-+#TYPE_SOCKLEN_T
-+#case $ac_cv_type_socklen_t in
-+SOCKLEN_T='size_t'
-+#  *)  	SOCKLEN_T=$git_cv_socklen_t_equiv;;
-+#esac
-+GIT_CONF_SUBST([SOCKLEN_T])
- 
- # Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent.
- AC_CHECK_MEMBER(struct dirent.d_ino,
diff --git a/mingw-w64-git-git/mingw64.patch b/mingw-w64-git-git/mingw64.patch
index f1d7f978d9..7b49068e72 100644
--- a/mingw-w64-git-git/mingw64.patch
+++ b/mingw-w64-git-git/mingw64.patch
@@ -1,10 +1,67 @@
---- git/compat/mingw.h	2014-06-02 10:26:25.000000000 +0100
-+++ git/compat/mingw.h	2014-07-12 05:37:52.542254700 +0100
-@@ -1,6 +1,6 @@
+diff --git a/compat/mingw.h b/compat/mingw.h
+index 9dbba85..28090d2 100644
+--- a/compat/mingw.h
++++ b/compat/mingw.h
+@@ -1,14 +1,13 @@
++#include <stdint.h>
++#include <wchar.h>
  #include <winsock2.h>
  #include <ws2tcpip.h>
 -
-+#include <stdint.h>
  /*
   * things that are not available in header files
   */
+ 
+-typedef int pid_t;
+ typedef int uid_t;
+ typedef int socklen_t;
+-#define hstrerror strerror
+ 
+ #define S_IFLNK    0120000 /* Symbolic link */
+ #define S_ISLNK(x) (((x) & S_IFMT) == S_IFLNK)
+@@ -86,8 +85,8 @@ struct itimerval {
+ 
+ static inline int fchmod(int fildes, mode_t mode)
+ { errno = ENOSYS; return -1; }
+-static inline pid_t fork(void)
+-{ errno = ENOSYS; return -1; }
++//static inline pid_t fork(void)
++//{ errno = ENOSYS; return -1; }
+ static inline unsigned int alarm(unsigned int seconds)
+ { return 0; }
+ static inline int fsync(int fd)
+diff --git a/configure.ac b/configure.ac
+index 5a3d531..faf9296 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -742,11 +742,11 @@ GIT_CONF_SUBST([OLD_ICONV])
+ ## Checks for typedefs, structures, and compiler characteristics.
+ AC_MSG_NOTICE([CHECKS for typedefs, structures, and compiler characteristics])
+ #
+-TYPE_SOCKLEN_T
+-case $ac_cv_type_socklen_t in
+-  yes)	SOCKLEN_T='';;
+-  *)  	SOCKLEN_T=$git_cv_socklen_t_equiv;;
+-esac
++#TYPE_SOCKLEN_T
++#case $ac_cv_type_socklen_t in
++SOCKLEN_T='size_t'
++#  *)  	SOCKLEN_T=$git_cv_socklen_t_equiv;;
++#esac
+ GIT_CONF_SUBST([SOCKLEN_T])
+ 
+ # Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent.
+diff --git a/git-compat-util.h b/git-compat-util.h
+index e0f258c..670c5e3 100644
+--- a/git-compat-util.h
++++ b/git-compat-util.h
+@@ -100,6 +100,9 @@ enum git_target_type {
+ #  define _WIN32_WINNT 0x0502
+ # endif
+ #define WIN32_LEAN_AND_MEAN  /* stops windows.h including winsock.h */
++# ifdef __MINGW64__
++#  undef _USE_32BIT_TIME_T
++# endif
+ #include <winsock2.h>
+ #include <windows.h>
+ #define GIT_WINDOWS_NATIVE