diff --git a/ucl/000-msys2.patch b/ucl/000-msys2.patch
deleted file mode 100644
index bf14d29f..00000000
--- a/ucl/000-msys2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/acconfig/config.sub.orig	2004-07-20 01:01:47.000000000 +0200
-+++ b/acconfig/config.sub	2015-02-21 21:28:00.383690700 +0100
-@@ -1160,7 +1160,7 @@
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* \
--	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -msys* | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff --git a/ucl/PKGBUILD b/ucl/PKGBUILD
index 49eb635f..a13a86f1 100644
--- a/ucl/PKGBUILD
+++ b/ucl/PKGBUILD
@@ -8,19 +8,17 @@
 _realname=ucl
 pkgname=("ucl" "ucl-devel")
 pkgver=1.03
-pkgrel=2
+pkgrel=3
 pkgdesc="Portable lossless data compression library written in ANSI C"
 arch=('i686' 'x86_64')
 license=('GPL')
 makedepends=('autotools' 'gcc')
 url="https://www.oberhumer.com/opensource/ucl/"
 source=("https://www.oberhumer.com/opensource/${_realname}/download/${_realname}-${pkgver}.tar.gz"
-        "000-msys2.patch"
         "001-autoconf-compat.patch"
         "002-missing-macros.patch"
         "003-no-undefined.patch")
 sha256sums=('b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348'
-            '46434a4cc85a35d04391745fa7cd317646bf883df7d220256597e7113b4f7497'
             '0cbd00a8383c098f98d5b022fcb4fa8d1448501e00221a223be04be0383bafc0'
             'ed5425536d98e2097488001e6e73d2ed93da65050a6fded62435bec077bc594b'
             '56a110aedab800c0a06cf4fd4dcef8f78691a0d091e2f143a2a8f02cfbb4c172')
@@ -28,21 +26,22 @@ sha256sums=('b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348'
 prepare() {
   cd "${_realname}-${pkgver}"
   rm -f acinclude.m4
-  patch -p1 -i "${srcdir}/000-msys2.patch"
+
   patch -p1 -i "${srcdir}/001-autoconf-compat.patch"
   patch -p1 -i "${srcdir}/002-missing-macros.patch"
   patch -p1 -i "${srcdir}/003-no-undefined.patch"
 
   touch ChangeLog
-  WANT_AUTOMAKE=latest autoreconf -fiv
+  WANT_AUTOCONF="2.69" autoreconf -fiv
 }
 
 build() {
   cd "${_realname}-${pkgver}"
-  
+
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   CPPFLAGS="$CPPFLAGS -std=c90 -fPIC" \
   ./configure \
-    --build=${CHOST} \
+    --build=${CYGWIN_CHOST} \
     --prefix=/usr \
     --enable-shared \
     --enable-static \