diff --git a/mingw-w64-xavs/0001-xavs-0.1.55-fix-dynamic-build.patch b/mingw-w64-xavs/0001-xavs-0.1.55-fix-dynamic-build.patch
index 134ee2142b..94ebfcc59b 100644
--- a/mingw-w64-xavs/0001-xavs-0.1.55-fix-dynamic-build.patch
+++ b/mingw-w64-xavs/0001-xavs-0.1.55-fix-dynamic-build.patch
@@ -1,5 +1,5 @@
---- xavs-0.1.55/configure	2017-11-01 07:06:44.216163200 -0400
-+++ xavs-0.1.55/configure	2017-11-01 07:08:12.358962400 -0400
+--- a/configure
++++ b/configure
 @@ -155,6 +155,7 @@
  host="${host#*-}"
  host_vendor="${host%%-*}"
@@ -8,7 +8,15 @@
  
  case $host_os in
    beos*)
-@@ -404,8 +405,7 @@
+@@ -397,15 +398,14 @@
+ fi
+ 
+ if [ "$pic" = "yes" ] ; then
+-    CFLAGS="$CFLAGS -fPIC"
++    CFLAGS="$CFLAGS"
+     ASFLAGS="$ASFLAGS -DPIC"
+     # resolve textrels in the x86 asm
+     cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
  fi
  
  if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
@@ -18,16 +26,19 @@
  fi
  
  if [ "$debug" = "yes" ]; then
---- xavs-0.1.55/Makefile	2017-11-01 07:09:46.732294400 -0400
-+++ xavs-0.1.55/Makefile	2017-11-01 07:09:50.859793100 -0400
-@@ -69,8 +69,8 @@
+--- a/Makefile
++++ b/Makefile
+@@ -67,10 +67,10 @@
+ 	$(RANLIB) libxavs.a
+ 
  $(SONAME): .depend $(OBJS) $(OBJASM)
- 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SOFLAGS) $(LDFLAGS)
+-	$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SOFLAGS) $(LDFLAGS)
++	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
  
 -xavs$(EXE): $(OBJCLI) libxavs.a 
 -	$(CC) -o $@ $+ $(LDFLAGS)
-+xavs$(EXE): $(OBJCLI) $(SONAME)
-+	$(CC) -o $@ $(OBJCLI) $(LDFLAGS) -L. -lxavs
++xavs$(EXE): $(OBJCLI) $(SONAME) libxavs.a
++	$(CC) -o $@ $(OBJCLI) -L. -lxavs $(LDFLAGS)
  
  xavsvfw.dll: libxavs.a $(wildcard vfw/*.c vfw/*.h)
  	make -C vfw/build/cygwin
diff --git a/mingw-w64-xavs/PKGBUILD b/mingw-w64-xavs/PKGBUILD
index d07ba7a307..806cc10d28 100644
--- a/mingw-w64-xavs/PKGBUILD
+++ b/mingw-w64-xavs/PKGBUILD
@@ -4,7 +4,7 @@ _realname=xavs
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.1.55
-pkgrel=1
+pkgrel=2
 pkgdesc="XAVS is to implement high quality encoder and decoder of the Audio Video Standard of China (AVS). (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
@@ -15,24 +15,21 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 source=("https://github.com/OpenMandrivaAssociation/xavs/raw/master/xavs-${pkgver}.tar.xz"
         "0001-xavs-0.1.55-fix-dynamic-build.patch"
         "0002-xavs-0.1.55-fix-asm.patch")
-sha256sums=("178bf04ffc5edd9acfa8188acbeeab16e24e4e43f4465729e8619f844e5901f2"
-            "0a6bdb653db4c63ab1c60ee5fd7303215523e6e06f62998c7a06520798be92c4"
-            "1559e0dfb21ee6f67dbd996ae0bb0c67987706db3144199202890de37cb7d8b4")
+sha256sums=('178bf04ffc5edd9acfa8188acbeeab16e24e4e43f4465729e8619f844e5901f2'
+            'dd717ff5096ea2ffd4c4793461269eee089e54e7db1184669d8f00c0fc67f1a4'
+            '1559e0dfb21ee6f67dbd996ae0bb0c67987706db3144199202890de37cb7d8b4')
 
 prepare(){
   cd "${srcdir}/${_realname}-${pkgver}"
   patch -Np1 -i "${srcdir}/0001-xavs-0.1.55-fix-dynamic-build.patch"
   patch -Np1 -i "${srcdir}/0002-xavs-0.1.55-fix-asm.patch"
-  sed -i -e 's|$(CC) -o $@ $(OBJCLI) $(LDFLAGS) -L. -lxavs|$(CC) -o $@ $(OBJCLI) -L. -lxavs $(LDFLAGS)|' Makefile
-  sed -i -e 's|xavs$(EXE): $(OBJCLI) $(SONAME)|xavs$(EXE): $(OBJCLI) $(SONAME) libxavs.a|' Makefile
 }
 
 build() {
   [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+  cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MINGW_CHOST}"
   cd "${srcdir}/build-${MINGW_CHOST}"
-  cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MINGW_CHOST}/${_realname}-${pkgver}"
-  cd "${_realname}-${pkgver}"
+
   ./configure \
     --prefix=${MINGW_PREFIX} \
     --host=${MINGW_CHOST} \
@@ -43,6 +40,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}/${_realname}-${pkgver}"
+  cd "${srcdir}/build-${MINGW_CHOST}"
   make DESTDIR=${pkgdir} install
 }