diff --git a/mingw-w64-openjpeg/PKGBUILD b/mingw-w64-openjpeg/PKGBUILD
index 22655e71af..df3dddccd6 100644
--- a/mingw-w64-openjpeg/PKGBUILD
+++ b/mingw-w64-openjpeg/PKGBUILD
@@ -4,7 +4,7 @@ _realname=openjpeg
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.5.2
-pkgrel=5
+pkgrel=6
 pkgdesc="An open source JPEG 2000 codec (mingw-w64)"
 arch=('any')
 url="http://www.openjpeg.org"
@@ -31,7 +31,7 @@ sha256sums=('3734e95edd0bef6e056815591755efd822228dc3cd866894e00a2c929026b16d'
             '7be4e0f98ddb9f120732309a402933cccd1a072c659abc02375726dabafad16c')
 
 prepare() {
-  cd "${srcdir}/openjpeg-version.${pkgver}"
+  cd "${srcdir}/${_realname}-version.${pkgver}"
   # Fix CRLF line endings
   dos2unix libopenjpeg/opj_malloc.h
   #rm -r thirdparty
@@ -65,9 +65,9 @@ build() {
   make
 
   msg "Build static version..."
-  [[ -d $srcdir/build-static-${MINGW_CHOST} ]] && rm -rf $srcdir/build-static-${MINGW_CHOST}
-  mkdir $srcdir/build-static-${MINGW_CHOST}
-  cd $srcdir/build-static-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-static-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-static-${MINGW_CHOST}
+  mkdir ${srcdir}/build-static-${MINGW_CHOST}
+  cd ${srcdir}/build-static-${MINGW_CHOST}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
diff --git a/mingw-w64-openjpeg2/PKGBUILD b/mingw-w64-openjpeg2/PKGBUILD
index abb20be1b2..5f2bbc1251 100644
--- a/mingw-w64-openjpeg2/PKGBUILD
+++ b/mingw-w64-openjpeg2/PKGBUILD
@@ -4,7 +4,7 @@ _realname=openjpeg
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}2"
 pkgver=2.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="An open source JPEG 2000 codec (mingw-w64)"
 arch=('any')
 url="http://www.openjpeg.org"
@@ -18,20 +18,20 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
              "${MINGW_PACKAGE_PREFIX}-cmake")
 options=('staticlibs' 'strip')
-source=("https://sourceforge.net/projects/${_realname}.mirror/files/${pkgver}/${_realname}-${pkgver}.tar.gz"
+source=(${_realname}-${pkgver}.tar.gz::https://github.com/uclouvain/openjpeg/archive/version.${pkgver%.*}.tar.gz
         0001-fix-install-for-dlls.all.patch
         0003-versioned-dlls.mingw.patch
         0005-sock-jpip.all.patch
         0006-openjpeg-2.1.0-stdcall-for-all-win.patch)
 
-sha256sums=('1232bb814fd88d8ed314c94f0bfebb03de8559583a33abbe8c64ef3fc0a8ff03'
+sha256sums=('4afc996cd5e0d16360d71c58216950bcb4ce29a3272360eb29cadb1c8bce4efc'
             '6d9d88474f815ddcd16b230c96aeb27171a640c5636e52182ae7cd1a1b5e23a3'
             '756f93b18ac80ea1cf90186d01800fcbe4dc40b36f164816f327f47b028902e1'
             'b7b22dca26d5fd98ca5bc6ce775bbbabebc0e10fcf07fd0afb54d580699b8312'
             'fcbc87fc5e51721e25ad9e50e84c336c9a5902ee8b2f2bb0800a3ea3fd72988e')
 
 prepare() {
-  cd "${srcdir}/${_realname}-$pkgver"
+  cd "${srcdir}/${_realname}-version.${pkgver%.*}"
   patch -p1 -i ${srcdir}/0001-fix-install-for-dlls.all.patch
   patch -p1 -i ${srcdir}/0003-versioned-dlls.mingw.patch
   patch -p1 -i ${srcdir}/0005-sock-jpip.all.patch
@@ -56,7 +56,7 @@ build() {
     -DBUILD_JPWL=ON \
     -DBUILD_JPIP=OFF \
     -DBUILD_JP3D=ON \
-    ../${_realname}-${pkgver}
+    ../${_realname}-version.${pkgver%.*}
   make
 
   msg "Build shared version"
@@ -70,7 +70,7 @@ build() {
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=ON \
-    -DBUILD_TESTING:BOOL=ON \
+    -DBUILD_TESTING=ON \
     -DCMAKE_SYSTEM_PREFIX_PATH=${MINGW_PREFIX} \
     -DBUILD_MJ2=ON \
     -DBUILD_JPWL=ON \
@@ -78,7 +78,7 @@ build() {
     -DBUILD_JP3D=ON \
     -DBUILD_DOC=OFF \
     -DBUILD_PKGCONFIG_FILES=ON \
-    ../${_realname}-${pkgver}
+    ../${_realname}-version.${pkgver%.*}
   make
 }