diff --git a/mingw-w64-freerdp/0008-fix-build-clang-x64.patch b/mingw-w64-freerdp/0008-fix-build-clang-x64.patch
new file mode 100644
index 0000000000..f3c7fa2897
--- /dev/null
+++ b/mingw-w64-freerdp/0008-fix-build-clang-x64.patch
@@ -0,0 +1,13 @@
+--- a/winpr/include/winpr/intrin.h
++++ b/winpr/include/winpr/intrin.h
+@@ -23,6 +23,10 @@
+ #define WINPR_INTRIN_H
+ 
+ #if !defined(_WIN32) || defined(__MINGW32__)
++
++#ifdef __lzcnt16
++#undef __lzcnt16
++#endif
+ 
+ /**
+  * __lzcnt16, __lzcnt, __lzcnt64:
diff --git a/mingw-w64-freerdp/PKGBUILD b/mingw-w64-freerdp/PKGBUILD
index 52438f70c8..62497a6aa9 100644
--- a/mingw-w64-freerdp/PKGBUILD
+++ b/mingw-w64-freerdp/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=freerdp
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.3.2
-pkgrel=2
+pkgver=2.6.1
+pkgrel=1
 pkgdesc="Free implementation of the Remote Desktop Protocol (RDP) (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -20,22 +20,24 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-iconv"
              "${MINGW_PACKAGE_PREFIX}-cc")
 options=('strip' '!debug' 'staticlibs')
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/${_realname}/${_realname}/archive/${pkgver}.tar.gz"
+source=("${_realname}-${pkgver}.tar.gz::https://github.com/${_realname}/${_realname}/releases/download/${pkgver}/${_realname}-${pkgver}.tar.gz"
         "0001-fix-warnings-mingw.patch"
         "0002-fix-build-errors-mingw.patch"
         "0003-remove-declspec-import-export.patch"
         "0004-remove-conflict-ntml-type.patch"
         "0005-rename-interface-variable.patch"
         "0006-fix-manpage_formatting.patch"
-        "0007-read-QuadPart-from-LARGE_INTEGER.patch")
-sha256sums=('a1f52f0d9569b418a555ffe4d15a3782712198be47308e9514d20ca5af41a1b1'
+        "0007-read-QuadPart-from-LARGE_INTEGER.patch"
+        "0008-fix-build-clang-x64.patch")
+sha256sums=('e4b3b93d102bc03164f592d26d7a06d6de648bf78b1e3dcbd8d62941431c1f28'
             '9e71e16b23cb7e1285bc395370b78cc9ca72f897bb8650820d5b4d5e5fcb5176'
             '06d869d249484b57f8da868c8cd5498d96bc4f3bcf669139e2bc7da8bf48a9e6'
             '7b5b85a83af0d2243d334cc4b4cd80e95077ca00c161792cf27cee62c42eae0f'
             '923fd3cd86d6d5815b72f15b7fe7c226349b38ff09b7475b1143cb5d7c015738'
             '5b3fe9a7d4d5db2096b0786c88da30ff8c2819b1703aa995badd8f90550d56e1'
             'f091fcdf13a4693835ca1aa0a3d5ef2f15b97c77f91af5a937e3acfbded14678'
-            '9c728341d0e7cd3896cee34b4dce78c18d5235a2cc336e2eae63e5fda354ac08')
+            '9c728341d0e7cd3896cee34b4dce78c18d5235a2cc336e2eae63e5fda354ac08'
+            '24e22252f766ea0c0520e12fddcbfb26820dd31200894750938237f52b7c6346')
 
 prepare() {
   mv -v "FreeRDP-${pkgver}" "${_realname}-${pkgver}"
@@ -66,13 +68,15 @@ prepare() {
   patch -Np1 -i "${srcdir}/0006-fix-manpage_formatting.patch"
 
   patch -Np1 -i "${srcdir}/0007-read-QuadPart-from-LARGE_INTEGER.patch"
+
+  patch -Np1 -i "${srcdir}/0008-fix-build-clang-x64.patch"
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
-  CFLAGS+=" -Wno-format" \
+  CFLAGS+=" -Wno-format -DWAVE_MAPPED_DEFAULT_COMMUNICATION_DEVICE=0x0010" \
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
     -Wno-dev \
@@ -98,6 +102,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
+  cd "${srcdir}/build-${MSYSTEM}"
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
 }