diff --git a/mingw-w64-openjpeg2/0003-versioned-dlls.mingw.patch b/mingw-w64-openjpeg2/0003-versioned-dlls.mingw.patch
deleted file mode 100644
index 95a5f675e0..0000000000
--- a/mingw-w64-openjpeg2/0003-versioned-dlls.mingw.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- openjpeg-2.3.1/src/lib/openjp2/CMakeLists.txt.orig	2019-04-04 02:55:04.959853700 -0400
-+++ openjpeg-2.3.1/src/lib/openjp2/CMakeLists.txt	2019-04-04 03:02:55.237882800 -0400
-@@ -107,6 +107,9 @@ if(UNIX)
-   target_link_libraries(${OPENJPEG_LIBRARY_NAME} m)
- endif()
- set_target_properties(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
-+if(MINGW)
-+  set_target_properties(${OPENJPEG_LIBRARY_NAME} PROPERTIES OUTPUT_NAME openjp2 RUNTIME_OUTPUT_NAME openjp2-${OPENJPEG_SOVERSION} ARCHIVE_OUTPUT_NAME openjp2)
-+endif(MINGW)
- if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12")
-   target_compile_options(${OPENJPEG_LIBRARY_NAME} PRIVATE ${OPENJP2_COMPILE_OPTIONS})
- endif()
---- openjpeg-2.3.1/src/lib/openjpip/CMakeLists.txt.orig	2019-04-04 02:55:04.963841200 -0400
-+++ openjpeg-2.3.1/src/lib/openjpip/CMakeLists.txt	2019-04-04 03:17:37.009413600 -0400
-@@ -62,6 +62,11 @@ endif()
- add_library(openjpip ${OPENJPIP_SRCS} ${LOCAL_SRCS})
- set_target_properties(openjpip
-   PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
-+if(MINGW)
-+  set_target_properties(openjpip 
-+    PROPERTIES OUTPUT_NAME openjpip RUNTIME_OUTPUT_NAME openjpip-${OPENJPEG_SOVERSION} 
-+    ARCHIVE_OUTPUT_NAME openjpip)
-+endif()
- if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12")
-   target_compile_options(openjpip PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
- endif()
diff --git a/mingw-w64-openjpeg2/PKGBUILD b/mingw-w64-openjpeg2/PKGBUILD
index 4dd3684ef8..b2cbdd3b7b 100644
--- a/mingw-w64-openjpeg2/PKGBUILD
+++ b/mingw-w64-openjpeg2/PKGBUILD
@@ -4,7 +4,7 @@ _realname=openjpeg
 pkgbase=mingw-w64-${_realname}2
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}2"
 pkgver=2.5.0
-pkgrel=3
+pkgrel=4
 pkgdesc="An open source JPEG 2000 codec (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -15,20 +15,16 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-libtiff"
          "${MINGW_PACKAGE_PREFIX}-libpng"
          "${MINGW_PACKAGE_PREFIX}-zlib")
-makedepends=("${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-pkg-config"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-cc")
-options=('staticlibs' 'strip')
+             "${MINGW_PACKAGE_PREFIX}-ninja")
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/uclouvain/openjpeg/archive/v${pkgver}.tar.gz
         0002-cmake-files-destination.patch
-        0003-versioned-dlls.mingw.patch
         0004-mingw-disable-java.patch
         0006-openjpeg-2.1.0-stdcall-for-all-win.patch
         0007-pkgconfig-add-Cflags-private.patch)
 sha256sums=('0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a'
             '31b2cc6824b07b705ba1c05b38904c8c4fc6ba39acefebda3e6ec85dbef9a174'
-            '671a2c884d4d7a232f105ae9224a3d5567f3cbf9a161b9a14f57b2b33e3ec53d'
             'adade9b29e4292b642d547644e26fab6e193bbfe31d25f07d89a8c35e4d0993d'
             '44679801b740ddb75edd4b55031c5f70a02eaf4f8e5eba5f3ad1b397b2ec4aed'
             '997dedd8211fc5e666b078b69ed622dd8ab4ceb05694b3ca593e92a32c151e2e')
@@ -55,7 +51,6 @@ prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
   apply_patch_with_msg \
    0002-cmake-files-destination.patch \
-   0003-versioned-dlls.mingw.patch \
    0004-mingw-disable-java.patch
 
   # Required for static linking in 32 bit, adds stdcall decorations in static libs
@@ -65,6 +60,13 @@ prepare() {
 }
 
 build() {
+  declare -a _extra_config
+  if check_option "debug" "n"; then
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
+  fi
+
   msg "Build static version"
   [[ -d ${srcdir}/build-static-${MSYSTEM} ]] && rm -rf ${srcdir}/build-static-${MSYSTEM}
   mkdir ${srcdir}/build-static-${MSYSTEM}
@@ -74,7 +76,7 @@ build() {
   ${MINGW_PREFIX}/bin/cmake \
     -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    -DCMAKE_BUILD_TYPE=Release \
+    ${_extra_config[@]} \
     -DBUILD_SHARED_LIBS=OFF \
     -DBUILD_STATIC_LIBS=ON \
     -DBUILD_TESTING=OFF \
@@ -94,7 +96,8 @@ build() {
   ${MINGW_PREFIX}/bin/cmake \
     -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SHARED_LIBRARY_NAME_WITH_VERSION=ON \
+    ${_extra_config[@]} \
     -DBUILD_SHARED_LIBS=ON \
     -DBUILD_STATIC_LIBS=OFF \
     -DBUILD_TESTING=ON \
@@ -110,10 +113,10 @@ build() {
 
 package() {
   cd "${srcdir}/build-static-${MSYSTEM}"
-  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --build ./ --target install
+  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install .
 
   cd "${srcdir}/build-shared-${MSYSTEM}"
-  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --build ./ --target install
+  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install .
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }