diff --git a/mingw-w64-csfml/0001-csfml-fix-building-docs.patch b/mingw-w64-csfml/0001-csfml-fix-building-docs.patch
deleted file mode 100644
index da6b361c92..0000000000
--- a/mingw-w64-csfml/0001-csfml-fix-building-docs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -48,7 +48,7 @@
- install(DIRECTORY ${DOXYGEN_OUTPUT_DIR}/html
-         DESTINATION ${INSTALL_MISC_DIR}/doc
-         COMPONENT doc)
--if(DOXYGEN_HHC_PROGRAM)
-+if(DOXYGEN_HHC_PROGRAM AND DOXYGEN_GENERATE_HTMLHELP)
-     install(FILES ${DOXYGEN_OUTPUT_DIR}/CSFML.chm
-             DESTINATION ${INSTALL_MISC_DIR}/doc
-             COMPONENT doc)
diff --git a/mingw-w64-csfml/PKGBUILD b/mingw-w64-csfml/PKGBUILD
index 7ce5ef3ab6..85f6a0f4f5 100644
--- a/mingw-w64-csfml/PKGBUILD
+++ b/mingw-w64-csfml/PKGBUILD
@@ -4,7 +4,8 @@ _realname=csfml
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-docs")
-pkgver=2.6.1
+pkgver=3.0.0.rc3
+_tag=3.0.0-rc.3
 pkgrel=1
 pkgdesc="A simple, fast, cross-platform, and object-oriented multimedia API for C (mingw-w64)"
 arch=('any')
@@ -16,37 +17,34 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-doxygen"
              "${MINGW_PACKAGE_PREFIX}-ninja")
-source=(https://github.com/SFML/CSFML/archive/${pkgver}/${_realname}-${pkgver}.tar.gz
-        0001-csfml-fix-building-docs.patch
+source=(https://github.com/SFML/CSFML/archive/${_tag}/${_realname}-${_tag}.tar.gz
         mingw-w64-msys2.patch)
-sha256sums=('f3f3980f6b5cad85b40e3130c10a2ffaaa9e36de5f756afd4aacaed98a7a9b7b'
-            'fc74f7e0524b8bba6a7ed775bf2a57bb84f14e63166e8860b3dfcf65692f5abb'
-            'e758cd07fcfc37b406f9625a79730043417d6809495c852af4c168d7a43287c5')
+sha256sums=('3de2803549241da5b8cb91fdc55575b6e3427802470eabdef2b789147be761a1'
+            '39423ae7a1f080d632f2ae2b01b5c850e9e7e7270629b2f57699c6798a6726f4')
 
 prepare() {
-  cd "${srcdir}"/CSFML-${pkgver}
-  patch -p1 -i "${srcdir}"/0001-csfml-fix-building-docs.patch
-  patch -p1 -i "${srcdir}"/mingw-w64-msys2.patch
+  cd CSFML-${_tag}
+
+  patch -p1 -i ../mingw-w64-msys2.patch
 }
 
 build() {
-  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
-
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-  ${MINGW_PREFIX}/bin/cmake.exe \
+  cmake \
     -GNinja \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DCSFML_LINK_SFML_STATICALLY=OFF \
     -DBUILD_SHARED_LIBS=ON \
     -DCSFML_BUILD_DOC=ON \
-    ../CSFML-${pkgver}
+    -S CSFML-${_tag} \
+    -B build-${MSYSTEM}
 
-  "${MINGW_PREFIX}"/bin/cmake.exe --build .
+  cmake --build build-${MSYSTEM}
 }
 
 package_csfml() {
-  DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install "${srcdir}/build-${MSYSTEM}"
-  install -Dm644 "${srcdir}/CSFML-${pkgver}/license.md" \
+  DESTDIR="${pkgdir}" cmake --install build-${MSYSTEM}
+  install -Dm644 CSFML-${_tag}/license.md \
     "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 
   # split docs
diff --git a/mingw-w64-csfml/mingw-w64-msys2.patch b/mingw-w64-csfml/mingw-w64-msys2.patch
index 1f60a72004..198708cf13 100644
--- a/mingw-w64-csfml/mingw-w64-msys2.patch
+++ b/mingw-w64-csfml/mingw-w64-msys2.patch
@@ -11,12 +11,14 @@
  endif()
 --- csfml/cmake/Macros.cmake.orig	2014-05-22 12:05:19.717000000 +0400
 +++ csfml/cmake/Macros.cmake	2014-05-22 12:14:36.733400000 +0400
-@@ -31,7 +31,7 @@
-         # on Windows/gcc get rid of "lib" prefix for shared libraries,
-         # and transform the ".dll.a" suffix into ".a" for import libraries
-         set_target_properties(${target} PROPERTIES PREFIX "")
--        set_target_properties(${target} PROPERTIES IMPORT_SUFFIX ".a")
-+        set_target_properties(${target} PROPERTIES IMPORT_SUFFIX ".dll.a")
-     endif()
+@@ -35,10 +37,6 @@
  
-     # set the version and soversion of the target (for compatible systems -- mostly Linuxes)
+             # on Windows/gcc get rid of "lib" prefix for shared libraries,
+             # and transform the ".dll.a" suffix into ".a" for import libraries
+-            if (SFML_COMPILER_GCC OR SFML_COMPILER_CLANG)
+-                set_target_properties(${target} PROPERTIES PREFIX "")
+-                set_target_properties(${target} PROPERTIES IMPORT_SUFFIX ".a")
+-            endif()
+         endif()
+     else()
+         set_target_properties(${target} PROPERTIES DEBUG_POSTFIX -s-d)