diff --git a/mingw-w64-libharu/win_various_install_files.patch b/mingw-w64-libharu/001-win_various_install_files.patch
similarity index 100%
rename from mingw-w64-libharu/win_various_install_files.patch
rename to mingw-w64-libharu/001-win_various_install_files.patch
diff --git a/mingw-w64-libharu/win_lib.patch b/mingw-w64-libharu/002-win_lib.patch
similarity index 100%
rename from mingw-w64-libharu/win_lib.patch
rename to mingw-w64-libharu/002-win_lib.patch
diff --git a/mingw-w64-libharu/003-fix-cmake-minor-version.patch b/mingw-w64-libharu/003-fix-cmake-minor-version.patch
new file mode 100644
index 0000000000..38515320af
--- /dev/null
+++ b/mingw-w64-libharu/003-fix-cmake-minor-version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ 
+ # information about libharu
+ set(LIBHPDF_MAJOR 2)
+-set(LIBHPDF_MINOR 2)
++set(LIBHPDF_MINOR 3)
+ set(LIBHPDF_PATCH 0)
+ set(LIBHPDF_VERSION ${LIBHPDF_MAJOR}.${LIBHPDF_MINOR}.${LIBHPDF_PATCH})
+ set(LIBHPDF_DESCRIPTION "libHaru is a free, cross platform, open source library for generating PDF files.")
diff --git a/mingw-w64-libharu/PKGBUILD b/mingw-w64-libharu/PKGBUILD
index edbe943ae7..ee5dd125a2 100644
--- a/mingw-w64-libharu/PKGBUILD
+++ b/mingw-w64-libharu/PKGBUILD
@@ -4,44 +4,59 @@ _realname=libharu
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="C library for generating PDF documents (mingw-w64)"
 url="https://github.com/libharu/libharu"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 license=('custom:ZLIB')
 depends=("${MINGW_PACKAGE_PREFIX}-libpng")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/libharu/libharu/archive/RELEASE_${pkgver//./_}.tar.gz"
-        "win_various_install_files.patch"
-        "win_lib.patch")
+        "001-win_various_install_files.patch"
+        "002-win_lib.patch"
+        "003-fix-cmake-minor-version.patch"
+        "${url}/pull/157.patch")
 sha256sums=('8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2'
             '2f5b85a98d650909e221d8dd57ed6f0eff7eca2695ddfd5fbd8727a798c5e9bf'
-            'ff416a8a2f991652169c330b3a374e66fbe85f62a7b41a3519e4a9b22a51fe02')
+            'ff416a8a2f991652169c330b3a374e66fbe85f62a7b41a3519e4a9b22a51fe02'
+            '1c7de8708e7060d10fb57ae666dd60a2cbcf58de45d4ebff52311da4e6ce5eaf'
+            '702f8e8443b6e306c91c45b4aa9f8ecc0abe29e72d1313db0a793a0fb72d420a')
 
 prepare() {
   cd "${srcdir}/${_realname}-RELEASE_${pkgver//./_}"
-  patch -p1 -i "${srcdir}/win_various_install_files.patch"
-  patch -p1 -i "${srcdir}/win_lib.patch"
+  patch -p1 -i "${srcdir}/001-win_various_install_files.patch"
+  patch -p1 -i "${srcdir}/002-win_lib.patch"
+  patch -p1 -i "${srcdir}/003-fix-cmake-minor-version.patch"
+  patch -p1 -i "${srcdir}/157.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}
+
+  declare -a extra_config
+  if check_option "debug" "n"; then
+    extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
+  fi
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
-    -G"MSYS Makefiles" \
-    -DCMAKE_BUILD_TYPE=Release \
+    -G"Ninja" \
+    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+    @{extra_config[@]} \
     -DBUILD_SHARED_LIBS=ON \
     -DBUILD_STATIC_LIBS=ON \
-    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     ../${_realname}-RELEASE_${pkgver//./_}
 
-  make
+  ${MINGW_PREFIX}/bin/cmake --build .
 }
 
 package() {
-  cd build-${MINGW_CHOST}
-  make DESTDIR=${pkgdir} install
+  cd build-${MSYSTEM}
+  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install .
 }