diff --git a/diffutils/PKGBUILD b/diffutils/PKGBUILD
index edcbd662..5a36a11c 100644
--- a/diffutils/PKGBUILD
+++ b/diffutils/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=diffutils
-pkgver=3.6
+pkgver=3.7
 pkgrel=1
 pkgdesc="Utility programs used for creating patch files"
 arch=('i686' 'x86_64')
@@ -11,14 +11,14 @@ groups=('base-devel')
 depends=('msys2-runtime' 'sh')
 install=diffutils.install
 source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
-        diffutils-3.3-msys2.patch)
-sha256sums=('d621e8bdd4b573918c8145f7ae61817d1be9deb4c8d2328a65cea8e11d783bd6'
+        diffutils-3.7-msys2.patch)
+sha256sums=('b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26'
             'SKIP'
-            'd58d5ee8c7b889a5027a43ce6d7f4ff5fc3d8927e389290c347ee9be094f6242')
+            '4242ebd1aeec43a74b965959a45792d696dc452681b75d49d508f1a21e87ee2e')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 -i ${srcdir}/diffutils-3.3-msys2.patch
+  patch -p1 -i ${srcdir}/diffutils-3.7-msys2.patch
 
   autoreconf -fi
 }
diff --git a/diffutils/diffutils-3.3-msys2.patch b/diffutils/diffutils-3.3-msys2.patch
deleted file mode 100644
index 20f719c2..00000000
--- a/diffutils/diffutils-3.3-msys2.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-diff -Naur diffutils-3.3-orig/build-aux/compile diffutils-3.3/build-aux/compile
---- diffutils-3.3-orig/build-aux/compile	2013-03-24 17:55:40.000000000 +0000
-+++ diffutils-3.3/build-aux/compile	2013-05-08 10:37:14.156250000 +0000
-@@ -53,7 +53,7 @@
- 	  MINGW*)
- 	    file_conv=mingw
- 	    ;;
--	  CYGWIN*)
-+	  CYGWIN* | MSYS*)
- 	    file_conv=cygwin
- 	    ;;
- 	  *)
-@@ -67,7 +67,7 @@
- 	mingw/*)
- 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
- 	  ;;
--	cygwin/*)
-+	cygwin/* | msys/*)
- 	  file=`cygpath -m "$file" || echo "$file"`
- 	  ;;
- 	wine/*)
-diff -Naur diffutils-3.3-orig/build-aux/config.guess diffutils-3.3/build-aux/config.guess
---- diffutils-3.3-orig/build-aux/config.guess	2013-03-22 04:20:48.000000000 +0000
-+++ diffutils-3.3/build-aux/config.guess	2013-05-08 10:37:14.171875000 +0000
-@@ -802,6 +802,9 @@
-     *:MINGW64*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw64
- 	exit ;;
-+    i*:MSYS*:*)
-+	echo ${UNAME_MACHINE}-pc-msys
-+	exit ;;
-     *:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
- 	exit ;;
-@@ -845,6 +848,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
- 	exit ;;
-diff -Naur diffutils-3.3-orig/build-aux/config.rpath diffutils-3.3/build-aux/config.rpath
---- diffutils-3.3-orig/build-aux/config.rpath	2013-03-22 04:20:48.000000000 +0000
-+++ diffutils-3.3/build-aux/config.rpath	2013-05-08 10:37:14.171875000 +0000
-@@ -57,7 +57,7 @@
-     aix*)
-       wl='-Wl,'
-       ;;
--    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
-       ;;
-     hpux9* | hpux10* | hpux11*)
-       wl='-Wl,'
-@@ -149,7 +149,7 @@
- hardcode_minus_L=no
- 
- case "$host_os" in
--  cygwin* | mingw* | pw32* | cegcc*)
-+  cygwin* | msys* | mingw* | pw32* | cegcc*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-     # When not using gcc, we currently assume that we are using
-     # Microsoft Visual C++.
-@@ -198,7 +198,7 @@
-         ld_shlibs=no
-       fi
-       ;;
--    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-       # no search path for DLLs.
-       hardcode_libdir_flag_spec='-L$libdir'
-@@ -348,7 +348,7 @@
-       ;;
-     bsdi[45]*)
-       ;;
--    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # When not using gcc, we currently assume that we are using
-       # Microsoft Visual C++.
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -537,7 +537,7 @@
-   bsdi[45]*)
-     library_names_spec='$libname$shrext'
-     ;;
--  cygwin* | mingw* | pw32* | cegcc*)
-+  cygwin* | msys* | mingw* | pw32* | cegcc*)
-     shrext=.dll
-     library_names_spec='$libname.dll.a $libname.lib'
-     ;;
-diff -Naur diffutils-3.3-orig/lib/gnulib.mk diffutils-3.3/lib/gnulib.mk
---- diffutils-3.3-orig/lib/gnulib.mk	2013-03-23 14:52:02.000000000 +0000
-+++ diffutils-3.3/lib/gnulib.mk	2013-05-08 10:37:14.250000000 +0000
-@@ -804,7 +804,7 @@
- 	  case '$(host_os)' in \
- 	    darwin[56]*) \
- 	      need_charset_alias=true ;; \
--	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+	    darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
- 	      need_charset_alias=false ;; \
- 	    *) \
- 	      need_charset_alias=true ;; \
-diff -Naur diffutils-3.3-orig/lib/Makefile.in diffutils-3.3/lib/Makefile.in
---- diffutils-3.3-orig/lib/Makefile.in	2013-03-24 17:55:42.000000000 +0000
-+++ diffutils-3.3/lib/Makefile.in	2013-05-08 10:37:14.234375000 +0000
-@@ -2065,7 +2065,7 @@
- 	  case '$(host_os)' in \
- 	    darwin[56]*) \
- 	      need_charset_alias=true ;; \
--	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+	    darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
- 	      need_charset_alias=false ;; \
- 	    *) \
- 	      need_charset_alias=true ;; \
-diff -Naur diffutils-3.3-orig/m4/btowc.m4 diffutils-3.3/m4/btowc.m4
---- diffutils-3.3-orig/m4/btowc.m4	2013-03-22 04:20:49.000000000 +0000
-+++ diffutils-3.3/m4/btowc.m4	2013-05-08 10:37:14.250000000 +0000
-@@ -49,7 +49,7 @@
- changequote(,)dnl
-            case "$host_os" in
-                       # Guess no on Cygwin.
--             cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
-+             cygwin* | msys*) gl_cv_func_btowc_nul="guessing no" ;;
-                       # Guess yes otherwise.
-              *)       gl_cv_func_btowc_nul="guessing yes" ;;
-            esac
-diff -Naur diffutils-3.3-orig/m4/double-slash-root.m4 diffutils-3.3/m4/double-slash-root.m4
---- diffutils-3.3-orig/m4/double-slash-root.m4	2013-03-22 04:20:49.000000000 +0000
-+++ diffutils-3.3/m4/double-slash-root.m4	2013-05-08 10:37:14.250000000 +0000
-@@ -16,7 +16,7 @@
-         # special semantics and is distinct from /, please report it to
-         # <bug-gnulib@gnu.org>.
-         case $host in
--          *-cygwin | i370-ibm-openedition)
-+          *-cygwin | *-msys | i370-ibm-openedition)
-             gl_cv_double_slash_root=yes ;;
-           *)
-             # Be optimistic and assume that / and // are the same when we
-diff -Naur diffutils-3.3-orig/m4/dup2.m4 diffutils-3.3/m4/dup2.m4
---- diffutils-3.3-orig/m4/dup2.m4	2013-03-22 04:20:49.000000000 +0000
-+++ diffutils-3.3/m4/dup2.m4	2013-05-08 10:41:12.903320300 +0000
-@@ -49,7 +49,7 @@
-         [case "$host_os" in
-            mingw*) # on this platform, dup2 always returns 0 for success
-              gl_cv_func_dup2_works="guessing no" ;;
--           cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
-+           cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0
-              gl_cv_func_dup2_works="guessing no" ;;
-            linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
-                    # closed fd may yield -EBADF instead of -1 / errno=EBADF.
-diff -Naur diffutils-3.3-orig/m4/getcwd.m4 diffutils-3.3/m4/getcwd.m4
---- diffutils-3.3-orig/m4/getcwd.m4	2013-03-22 04:20:49.000000000 +0000
-+++ diffutils-3.3/m4/getcwd.m4	2013-05-08 10:41:31.262695300 +0000
-@@ -49,7 +49,7 @@
-                      # Guess yes on glibc systems.
-             *-gnu*)  gl_cv_func_getcwd_null="guessing yes";;
-                      # Guess yes on Cygwin.
--            cygwin*) gl_cv_func_getcwd_null="guessing yes";;
-+            cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";;
-                      # If we don't know, assume the worst.
-             *)       gl_cv_func_getcwd_null="guessing no";;
-           esac
-diff -Naur diffutils-3.3-orig/m4/malloc.m4 diffutils-3.3/m4/malloc.m4
---- diffutils-3.3-orig/m4/malloc.m4	2013-03-22 04:20:49.000000000 +0000
-+++ diffutils-3.3/m4/malloc.m4	2013-05-08 10:44:46.582031200 +0000
-@@ -30,7 +30,7 @@
-        [case "$host_os" in
-           # Guess yes on platforms where we know the result.
-           *-gnu* | freebsd* | netbsd* | openbsd* \
--          | hpux* | solaris* | cygwin* | mingw*)
-+          | hpux* | solaris* | cygwin* | msys* | mingw*)
-             ac_cv_func_malloc_0_nonnull=yes ;;
-           # If we don't know, assume the worst.
-           *) ac_cv_func_malloc_0_nonnull=no ;;
-diff -Naur diffutils-3.3-orig/m4/printf.m4 diffutils-3.3/m4/printf.m4
---- diffutils-3.3-orig/m4/printf.m4	2013-03-22 04:20:49.000000000 +0000
-+++ diffutils-3.3/m4/printf.m4	2013-05-08 10:37:14.281250000 +0000
-@@ -735,7 +735,7 @@
-            openbsd*)        gl_cv_func_printf_directive_ls="guessing no";;
-            irix*)           gl_cv_func_printf_directive_ls="guessing no";;
-            solaris*)        gl_cv_func_printf_directive_ls="guessing no";;
--           cygwin*)         gl_cv_func_printf_directive_ls="guessing no";;
-+           cygwin* | msys*)         gl_cv_func_printf_directive_ls="guessing no";;
-            beos* | haiku*)  gl_cv_func_printf_directive_ls="guessing no";;
-            *)               gl_cv_func_printf_directive_ls="guessing yes";;
-          esac
-@@ -812,7 +812,7 @@
-         [
- changequote(,)dnl
-          case "$host_os" in
--           cygwin*)      gl_cv_func_printf_flag_grouping="guessing no";;
-+           cygwin* | msys*)      gl_cv_func_printf_flag_grouping="guessing no";;
-            netbsd*)      gl_cv_func_printf_flag_grouping="guessing no";;
-            mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
-            *)            gl_cv_func_printf_flag_grouping="guessing yes";;
-@@ -1464,7 +1464,7 @@
-            darwin[1-6].*)        gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
-            darwin*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                  # Guess yes on Cygwin.
--           cygwin*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-+           cygwin* | msys*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                  # Guess yes on Solaris >= 2.6.
-            solaris2.[0-5] | solaris2.[0-5].*)
-                                  gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
-diff -Naur diffutils-3.3-orig/m4/setlocale.m4 diffutils-3.3/m4/setlocale.m4
---- diffutils-3.3-orig/m4/setlocale.m4	2013-03-22 04:20:49.000000000 +0000
-+++ diffutils-3.3/m4/setlocale.m4	2013-05-08 10:37:14.281250000 +0000
-@@ -14,7 +14,7 @@
-     mingw*) REPLACE_SETLOCALE=1 ;;
-     dnl On Cygwin 1.5.x, setlocale always succeeds but setlocale(LC_CTYPE,NULL)
-     dnl is then still "C".
--    cygwin*)
-+    cygwin* | msys*)
-       case `uname -r` in
-         1.5.*) REPLACE_SETLOCALE=1 ;;
-       esac
-diff -Naur diffutils-3.3-orig/m4/wctob.m4 diffutils-3.3/m4/wctob.m4
---- diffutils-3.3-orig/m4/wctob.m4	2013-03-22 04:20:49.000000000 +0000
-+++ diffutils-3.3/m4/wctob.m4	2013-05-08 10:37:14.281250000 +0000
-@@ -29,14 +29,14 @@
- changequote(,)dnl
-         case "$host_os" in
-             # Guess no on Solaris <= 9 and Cygwin.
--          solaris2.[1-9] | solaris2.[1-9].* | cygwin*)
-+          solaris2.[1-9] | solaris2.[1-9].* | cygwin* | msys*)
-             gl_cv_func_wctob_works="guessing no" ;;
-             # Guess yes otherwise.
-           *) gl_cv_func_wctob_works="guessing yes" ;;
-         esac
- changequote([,])dnl
-         case "$host_os" in
--          cygwin*)
-+          cygwin* | msys*)
-             AC_RUN_IFELSE(
-               [AC_LANG_SOURCE([[
- #include <locale.h>
diff --git a/diffutils/diffutils-3.7-msys2.patch b/diffutils/diffutils-3.7-msys2.patch
new file mode 100644
index 00000000..e733eca5
--- /dev/null
+++ b/diffutils/diffutils-3.7-msys2.patch
@@ -0,0 +1,238 @@
+diff -Naur diffutils-3.7-orig/build-aux/ar-lib diffutils-3.7/build-aux/ar-lib
+--- diffutils-3.7-orig/build-aux/ar-lib	2017-02-24 08:10:09.000000000 +0300
++++ diffutils-3.7/build-aux/ar-lib	2019-01-15 10:45:13.257024200 +0300
+@@ -56,6 +56,9 @@
+ 	  CYGWIN*)
+ 	    file_conv=cygwin
+ 	    ;;
++	  MSYS*)
++	    file_conv=cygwin
++	    ;;
+ 	  *)
+ 	    file_conv=wine
+ 	    ;;
+@@ -68,6 +71,9 @@
+ 	cygwin)
+ 	  file=`cygpath -m "$file" || echo "$file"`
+ 	  ;;
++	msys)
++	  file=`cygpath -m "$file" || echo "$file"`
++	  ;;
+ 	wine)
+ 	  file=`winepath -w "$file" || echo "$file"`
+ 	  ;;
+diff -Naur diffutils-3.7-orig/build-aux/compile diffutils-3.7/build-aux/compile
+--- diffutils-3.7-orig/build-aux/compile	2019-01-01 04:37:29.000000000 +0300
++++ diffutils-3.7/build-aux/compile	2019-01-15 10:41:20.472415300 +0300
+@@ -53,7 +53,7 @@
+ 	  MINGW*)
+ 	    file_conv=mingw
+ 	    ;;
+-	  CYGWIN*)
++	  CYGWIN* | MSYS*)
+ 	    file_conv=cygwin
+ 	    ;;
+ 	  *)
+@@ -67,7 +67,7 @@
+ 	mingw/*)
+ 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ 	  ;;
+-	cygwin/*)
++	cygwin/* | msys/*)
+ 	  file=`cygpath -m "$file" || echo "$file"`
+ 	  ;;
+ 	wine/*)
+diff -Naur diffutils-3.7-orig/build-aux/config.guess diffutils-3.7/build-aux/config.guess
+--- diffutils-3.7-orig/build-aux/config.guess	2018-12-24 04:21:56.000000000 +0300
++++ diffutils-3.7/build-aux/config.guess	2019-01-15 10:45:58.513703700 +0300
+@@ -869,6 +869,9 @@
+     *:MINGW64*:*)
+ 	echo "$UNAME_MACHINE"-pc-mingw64
+ 	exit ;;
++    i*:MSYS*:*)
++	echo ${UNAME_MACHINE}-pc-msys
++	exit ;;
+     *:MINGW*:*)
+ 	echo "$UNAME_MACHINE"-pc-mingw32
+ 	exit ;;
+@@ -896,6 +899,9 @@
+     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ 	echo x86_64-pc-cygwin
+ 	exit ;;
++    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
++	echo x86_64-pc-msys
++	exit ;;
+     prep*:SunOS:5.*:*)
+ 	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ 	exit ;;
+diff -Naur diffutils-3.7-orig/build-aux/config.rpath diffutils-3.7/build-aux/config.rpath
+--- diffutils-3.7-orig/build-aux/config.rpath	2018-01-07 03:45:52.000000000 +0300
++++ diffutils-3.7/build-aux/config.rpath	2019-01-15 10:41:20.503615300 +0300
+@@ -57,7 +57,7 @@
+     aix*)
+       wl='-Wl,'
+       ;;
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       ;;
+     hpux9* | hpux10* | hpux11*)
+       wl='-Wl,'
+@@ -149,7 +149,7 @@
+ hardcode_minus_L=no
+ 
+ case "$host_os" in
+-  cygwin* | mingw* | pw32* | cegcc*)
++  cygwin* | msys* | mingw* | pw32* | cegcc*)
+     # FIXME: the MSVC++ port hasn't been tested in a loooong time
+     # When not using gcc, we currently assume that we are using
+     # Microsoft Visual C++.
+@@ -198,7 +198,7 @@
+         ld_shlibs=no
+       fi
+       ;;
+-    cygwin* | mingw* | pw32* | cegcc*)
++    cygwin* | msys* | mingw* | pw32* | cegcc*)
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       hardcode_libdir_flag_spec='-L$libdir'
+@@ -348,7 +348,7 @@
+       ;;
+     bsdi[45]*)
+       ;;
+-    cygwin* | mingw* | pw32* | cegcc*)
++    cygwin* | msys* | mingw* | pw32* | cegcc*)
+       # When not using gcc, we currently assume that we are using
+       # Microsoft Visual C++.
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+@@ -533,7 +533,7 @@
+   bsdi[45]*)
+     library_names_spec='$libname$shrext'
+     ;;
+-  cygwin* | mingw* | pw32* | cegcc*)
++  cygwin* | msys* | mingw* | pw32* | cegcc*)
+     shrext=.dll
+     library_names_spec='$libname.dll.a $libname.lib'
+     ;;
+diff -Naur diffutils-3.7-orig/m4/btowc.m4 diffutils-3.7/m4/btowc.m4
+--- diffutils-3.7-orig/m4/btowc.m4	2018-01-07 03:45:52.000000000 +0300
++++ diffutils-3.7/m4/btowc.m4	2019-01-16 07:32:38.096944800 +0300
+@@ -51,6 +51,8 @@
+                       # Guess no on Cygwin.
+              cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
+                       # Guess yes on native Windows.
++             msys*)   gl_cv_func_btowc_nul="guessing no" ;;
++                      # Guess yes on native Windows.
+              mingw*)  gl_cv_func_btowc_nul="guessing yes" ;;
+                       # Guess yes otherwise.
+              *)       gl_cv_func_btowc_nul="guessing yes" ;;
+diff -Naur diffutils-3.7-orig/m4/double-slash-root.m4 diffutils-3.7/m4/double-slash-root.m4
+--- diffutils-3.7-orig/m4/double-slash-root.m4	2018-01-07 03:45:52.000000000 +0300
++++ diffutils-3.7/m4/double-slash-root.m4	2019-01-15 10:41:20.534815400 +0300
+@@ -16,7 +16,7 @@
+         # special semantics and is distinct from /, please report it to
+         # <bug-gnulib@gnu.org>.
+         case $host in
+-          *-cygwin | i370-ibm-openedition)
++          *-cygwin | *-msys | i370-ibm-openedition)
+             gl_cv_double_slash_root=yes ;;
+           *)
+             # Be optimistic and assume that / and // are the same when we
+diff -Naur diffutils-3.7-orig/m4/dup2.m4 diffutils-3.7/m4/dup2.m4
+--- diffutils-3.7-orig/m4/dup2.m4	2018-01-07 03:45:52.000000000 +0300
++++ diffutils-3.7/m4/dup2.m4	2019-01-15 10:41:20.550415400 +0300
+@@ -78,7 +78,7 @@
+         [case "$host_os" in
+            mingw*) # on this platform, dup2 always returns 0 for success
+              gl_cv_func_dup2_works="guessing no" ;;
+-           cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
++           cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0
+              gl_cv_func_dup2_works="guessing no" ;;
+            aix* | freebsd*)
+                    # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
+diff -Naur diffutils-3.7-orig/m4/fcntl.m4 diffutils-3.7/m4/fcntl.m4
+--- diffutils-3.7-orig/m4/fcntl.m4	2018-01-07 03:45:52.000000000 +0300
++++ diffutils-3.7/m4/fcntl.m4	2019-01-16 07:33:22.262070800 +0300
+@@ -69,7 +69,7 @@
+          [gl_cv_func_fcntl_f_dupfd_works=yes],
+          [gl_cv_func_fcntl_f_dupfd_works=no],
+          [case $host_os in
+-            aix* | cygwin* | haiku*)
++            aix* | cygwin* | msys* | haiku*)
+                gl_cv_func_fcntl_f_dupfd_works="guessing no" ;;
+             *) gl_cv_func_fcntl_f_dupfd_works="guessing yes" ;;
+           esac])])
+diff -Naur diffutils-3.7-orig/m4/getcwd.m4 diffutils-3.7/m4/getcwd.m4
+--- diffutils-3.7-orig/m4/getcwd.m4	2018-06-25 07:08:29.000000000 +0300
++++ diffutils-3.7/m4/getcwd.m4	2019-01-16 07:33:54.355413900 +0300
+@@ -51,7 +51,7 @@
+                            # Guess yes on glibc systems.
+             *-gnu* | gnu*) gl_cv_func_getcwd_null="guessing yes";;
+                            # Guess yes on Cygwin.
+-            cygwin*)       gl_cv_func_getcwd_null="guessing yes";;
++            cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";;
+                            # If we don't know, assume the worst.
+             *)             gl_cv_func_getcwd_null="guessing no";;
+           esac
+diff -Naur diffutils-3.7-orig/m4/printf.m4 diffutils-3.7/m4/printf.m4
+--- diffutils-3.7-orig/m4/printf.m4	2018-12-24 04:21:56.000000000 +0300
++++ diffutils-3.7/m4/printf.m4	2019-01-16 07:34:27.521072200 +0300
+@@ -769,7 +769,7 @@
+            openbsd*)       gl_cv_func_printf_directive_ls="guessing no";;
+            irix*)          gl_cv_func_printf_directive_ls="guessing no";;
+            solaris*)       gl_cv_func_printf_directive_ls="guessing no";;
+-           cygwin*)        gl_cv_func_printf_directive_ls="guessing no";;
++           cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";;
+            beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
+                            # Guess yes on native Windows.
+            mingw*)         gl_cv_func_printf_directive_ls="guessing yes";;
+@@ -849,7 +849,7 @@
+         [
+ changequote(,)dnl
+          case "$host_os" in
+-           cygwin*)      gl_cv_func_printf_flag_grouping="guessing no";;
++           cygwin* | msys*)      gl_cv_func_printf_flag_grouping="guessing no";;
+            netbsd*)      gl_cv_func_printf_flag_grouping="guessing no";;
+                          # Guess no on native Windows.
+            mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
+@@ -1524,7 +1524,7 @@
+            darwin[1-6].*)        gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+            darwin*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                  # Guess yes on Cygwin.
+-           cygwin*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
++           cygwin* | msys*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                  # Guess yes on Solaris >= 2.6.
+            solaris2.[0-5] | solaris2.[0-5].*)
+                                  gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+diff -Naur diffutils-3.7-orig/m4/setlocale.m4 diffutils-3.7/m4/setlocale.m4
+--- diffutils-3.7-orig/m4/setlocale.m4	2018-12-24 04:21:56.000000000 +0300
++++ diffutils-3.7/m4/setlocale.m4	2019-01-15 10:41:20.597215500 +0300
+@@ -14,7 +14,7 @@
+     mingw*) REPLACE_SETLOCALE=1 ;;
+     dnl On Cygwin 1.5.x, setlocale always succeeds but setlocale(LC_CTYPE,NULL)
+     dnl is then still "C".
+-    cygwin*)
++    cygwin* | msys*)
+       case `uname -r` in
+         1.5.*) REPLACE_SETLOCALE=1 ;;
+       esac
+diff -Naur diffutils-3.7-orig/m4/wctob.m4 diffutils-3.7/m4/wctob.m4
+--- diffutils-3.7-orig/m4/wctob.m4	2018-01-07 03:45:53.000000000 +0300
++++ diffutils-3.7/m4/wctob.m4	2019-01-16 07:35:46.613211100 +0300
+@@ -29,7 +29,7 @@
+ changequote(,)dnl
+         case "$host_os" in
+             # Guess no on Solaris <= 9 and Cygwin.
+-          solaris2.[1-9] | solaris2.[1-9].* | cygwin*)
++          solaris2.[1-9] | solaris2.[1-9].* | cygwin* | msys*)
+             gl_cv_func_wctob_works="guessing no" ;;
+             # Guess no on native Windows.
+           mingw*)
+@@ -39,7 +39,7 @@
+         esac
+ changequote([,])dnl
+         case "$host_os" in
+-          cygwin*)
++          cygwin* | msys*)
+             AC_RUN_IFELSE(
+               [AC_LANG_SOURCE([[
+ #include <locale.h>