diff --git a/apr-util/PKGBUILD b/apr-util/PKGBUILD
index cc00bbe8..54cb03d8 100644
--- a/apr-util/PKGBUILD
+++ b/apr-util/PKGBUILD
@@ -1,33 +1,34 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=('apr-util' 'apr-util-devel')
-pkgver=1.6.1
+pkgver=1.6.3
 pkgrel=1
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64')
 url="https://apr.apache.org/"
 makedepends=('apr-devel' 'libexpat-devel' 'libsqlite-devel' 'autotools' 'gcc')
 options=('!libtool')
-license=('APACHE')
+license=('spdx:Apache-2.0')
 source=("https://archive.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2"
-        apr-util-1.5.3-msys2.patch
         plugins.patch)
-sha256sums=('d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b'
-            '55e5f524a5323476f5e224ed9d748a5417a64d5b21b89b2267a22ea4e32b9269'
-            'd79c9202ce6ddc9a67a671ec5bcf495672330a4fa7e29446fa54db793f3f09fe')
+sha256sums=('a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5'
+            '3280d6ed8e577b626e60d495856d16f6944c3144c495fe9ed8cad6b39332824c')
 
 prepare() {
   cd "${srcdir}/apr-util-${pkgver}"
 
   patch -p1 -i ${srcdir}/plugins.patch
-  patch -p1 -i ${srcdir}/apr-util-1.5.3-msys2.patch
 
   autoreconf -fi
 }
 
 build() {
   cd "${srcdir}/apr-util-${pkgver}"
-  ./configure --build=${CHOST} \
+
+  export MSYSTEM=CYGWIN
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
+  ./configure \
+    --build=${CYGWIN_CHOST} \
     --prefix=/usr \
     --with-apr=/usr \
     --with-expat=/usr \
diff --git a/apr-util/apr-util-1.5.3-msys2.patch b/apr-util/apr-util-1.5.3-msys2.patch
deleted file mode 100644
index 31e53b24..00000000
--- a/apr-util/apr-util-1.5.3-msys2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur apr-util-1.5.2-orig/build/config.guess apr-util-1.5.2/build/config.guess
---- apr-util-1.5.2-orig/build/config.guess	2011-05-20 20:22:23.000000000 +0000
-@@ -870,6 +870,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
diff --git a/apr-util/plugins.patch b/apr-util/plugins.patch
index 8024bf79..b450f3a4 100644
--- a/apr-util/plugins.patch
+++ b/apr-util/plugins.patch
@@ -16,8 +16,8 @@ index 963fead..c9827de 100644
  INSTALL_DATA = @INSTALL_DATA@
  
  APU_MODULES = @APU_MODULES@
--LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -rpath $(APU_DSO_LIBDIR)
-+LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -no-undefined -rpath $(APU_DSO_LIBDIR) @abs_builddir@/lib@APRUTIL_LIBNAME@.la $(APRUTIL_LIBS)
+-LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -rpath $(APU_DSO_LIBDIR)
++LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -no-undefined -rpath $(APU_DSO_LIBDIR) @abs_builddir@/lib@APRUTIL_LIBNAME@.la $(APRUTIL_LIBS)
  APU_DSO_LIBDIR = @APU_DSO_LIBDIR@
  
  LT_VERSION = @APU_LTVERSION@